Move //{chromeos => ash}/components/quick_answers
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I88b49cc0caa81d9697e36e210f0a7e57fed0e7f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3127467
Commit-Queue: Yeunjoo Choi <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#916629}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 6a5eb37..0256bcb2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2397,6 +2397,7 @@
]
deps += [
"//ash/components/audio",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/webui/diagnostics_ui",
"//ash/webui/diagnostics_ui/mojom",
@@ -2439,7 +2440,6 @@
"//chromeos/components/personalization_app/mojom",
"//chromeos/components/print_management",
"//chromeos/components/print_management/mojom",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/dbus/attestation",
"//chromeos/dbus/attestation:attestation_proto",
"//chromeos/dbus/cros_disks",
@@ -4738,6 +4738,7 @@
deps += [
"//ash",
"//ash/components/account_manager",
+ "//ash/components/quick_answers",
"//ash/public/cpp",
"//ash/public/cpp/external_arc",
"//build:chromeos_buildflags",
@@ -4764,7 +4765,6 @@
"//chrome/services/sharing/public/proto",
"//chrome/services/speech:lib",
"//chromeos/components/feature_usage",
- "//chromeos/components/quick_answers",
"//chromeos/components/sync_wifi",
"//chromeos/crosapi/cpp",
"//chromeos/crosapi/mojom",
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 498ec36..0f8d938 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -84,6 +84,7 @@
"//ash/components/enhanced_network_tts/mojom",
"//ash/components/pcie_peripheral",
"//ash/components/power",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/public/cpp",
"//ash/public/cpp/external_arc",
@@ -168,7 +169,6 @@
"//chromeos/components/print_management/mojom",
"//chromeos/components/projector_app",
"//chromeos/components/proximity_auth",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/components/remote_apps/mojom",
"//chromeos/components/sensors",
"//chromeos/components/sensors:buildflags",
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index bb77ca9..237864d19 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -12,6 +12,7 @@
#include <sstream>
#include <utility>
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/app_types.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/public/cpp/accelerators.h"
@@ -120,7 +121,6 @@
#include "chrome/browser/web_applications/web_app_registrar.h"
#include "chrome/common/extensions/api/autotest_private.h"
#include "chrome/common/pref_names.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "chromeos/printing/printer_configuration.h"
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 28a1d7e..9a34731 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1090,6 +1090,7 @@
deps += [
"//ash",
"//ash/components/enhanced_network_tts/mojom",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/keyboard/ui:resources_grit_grit",
"//ash/public/cpp",
@@ -1104,7 +1105,6 @@
"//chromeos/components/camera_app_ui/resources:chrome_camera_app",
"//chromeos/components/chromebox_for_meetings/buildflags",
"//chromeos/components/proximity_auth",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/components/remote_apps/mojom",
"//chromeos/cryptohome",
"//chromeos/dbus",
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 6c4aa68..30822e4 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -58,6 +58,7 @@
#include "extensions/common/extension.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/constants/ash_pref_names.h" // nogncheck
#include "ash/public/cpp/ambient/ambient_prefs.h"
@@ -74,7 +75,6 @@
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.h"
#include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/account_manager_core/pref_names.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index bc68e98f..86a88c4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -266,6 +266,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/audio/audio_devices_pref_handler_impl.h"
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
#include "chrome/browser/apps/app_service/app_platform_metrics_service.h"
@@ -362,7 +363,6 @@
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h"
#include "chrome/browser/upgrade_detector/upgrade_detector_chromeos.h"
#include "chromeos/components/local_search_service/search_metrics_reporter.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/network/cellular_esim_profile_handler_impl.h"
#include "chromeos/network/cellular_metrics_logger.h"
#include "chromeos/network/fast_transition_observer.h"
diff --git a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
index 1a69e06..9efd21b7 100644
--- a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
#include "ash/public/cpp/quick_answers/controller/quick_answers_controller.h"
@@ -19,7 +20,6 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
#include "chromeos/services/assistant/public/cpp/assistant_service.h"
#include "components/language/core/browser/pref_names.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
index cadd1b7f..7ce3f6d 100644
--- a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_client.h"
#include "base/time/time.h"
-#include "chromeos/components/quick_answers/quick_answers_client.h"
#include "components/renderer_context_menu/render_view_context_menu_observer.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 3a6df6b..bf118f5 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2749,6 +2749,7 @@
"//ash/components/drivefs",
"//ash/components/drivefs/mojom:mojom",
"//ash/components/pcie_peripheral",
+ "//ash/components/quick_answers",
"//ash/constants",
"//ash/keyboard/ui",
"//ash/public/cpp",
@@ -2823,7 +2824,6 @@
"//chromeos/components/print_management",
"//chromeos/components/projector_app",
"//chromeos/components/proximity_auth",
- "//chromeos/components/quick_answers",
"//chromeos/components/string_matching",
"//chromeos/components/tether",
"//chromeos/components/web_applications",
