diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 5123effe15ff08..e1080b92987cf6 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -2334,6 +2334,8 @@ component("ash") { "//chromeos/ash/components/network", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//chromeos/ash/services/libassistant/public/cpp:structs", "//chromeos/ash/services/libassistant/public/mojom", "//chromeos/components/quick_answers/public/cpp:prefs", @@ -2348,8 +2350,6 @@ component("ash") { "//chromeos/dbus/power:power_manager_proto", "//chromeos/login/login_state", "//chromeos/metrics", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", "//chromeos/services/hotspot_config/public/mojom", "//chromeos/services/network_config/public/cpp", "//chromeos/services/network_config/public/mojom", @@ -3151,6 +3151,7 @@ test("ash_unittests") { "//chromeos/ash/services/assistant:test_support", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config:test_support", "//chromeos/components/sensors:sensors", "//chromeos/components/sensors:test_support", "//chromeos/components/sensors/mojom", @@ -3158,7 +3159,6 @@ test("ash_unittests") { "//chromeos/crosapi/cpp", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", - "//chromeos/services/bluetooth_config:test_support", "//chromeos/services/network_config/public/cpp", "//chromeos/services/network_config/public/mojom", "//chromeos/strings:strings_grit", @@ -3594,10 +3594,10 @@ static_library("test_support") { "//chromeos/ash/components/network:test_support", "//chromeos/ash/services/assistant:test_support", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:test_support", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", "//chromeos/login/login_state", - "//chromeos/services/bluetooth_config:test_support", "//chromeos/system", "//chromeos/ui/frame", "//components/account_id", diff --git a/ash/DEPS b/ash/DEPS index be8a3e2567e7ac..c65c20e26eb857 100644 --- a/ash/DEPS +++ b/ash/DEPS @@ -87,8 +87,8 @@ include_rules = [ # //ash can use the public interfaces of various services. "+chromeos/ash/services/assistant/public/cpp" , "+chromeos/ash/services/assistant/test_support", + "+chromeos/ash/services/bluetooth_config", "+chromeos/ash/services/libassistant/public", - "+chromeos/services/bluetooth_config", "+chromeos/services/machine_learning/public", "+chromeos/services/network_config/public", "+chromeos/services/power/public", diff --git a/ash/components/hid_detection/BUILD.gn b/ash/components/hid_detection/BUILD.gn index 53425cfdd26f5d..10c1c5478dfc27 100644 --- a/ash/components/hid_detection/BUILD.gn +++ b/ash/components/hid_detection/BUILD.gn @@ -24,7 +24,7 @@ static_library("hid_detection") { "//ash/constants:constants", "//ash/public/cpp", "//base", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//components/device_event_log", "//device/bluetooth", "//mojo/public/cpp/bindings", @@ -63,9 +63,9 @@ source_set("unit_tests") { "//ash/constants", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config:test_support", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config:test_support", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//device/bluetooth:mocks", "//mojo/public/cpp/bindings", "//services/device/public/cpp/hid:hid", diff --git a/ash/components/hid_detection/DEPS b/ash/components/hid_detection/DEPS index 72649ad7885f46..3ad57e6d503bba 100644 --- a/ash/components/hid_detection/DEPS +++ b/ash/components/hid_detection/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+chromeos/services/bluetooth_config", "+components/device_event_log", "+services/device/public", -] \ No newline at end of file +] diff --git a/ash/components/hid_detection/bluetooth_hid_detector_impl.h b/ash/components/hid_detection/bluetooth_hid_detector_impl.h index f892f2111f44e8..d7358018da3ed7 100644 --- a/ash/components/hid_detection/bluetooth_hid_detector_impl.h +++ b/ash/components/hid_detection/bluetooth_hid_detector_impl.h @@ -11,7 +11,7 @@ #include "base/containers/queue.h" #include "base/memory/weak_ptr.h" #include "base/timer/elapsed_timer.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc b/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc index be42c3776ce2f5..5fb166e2714c8b 100644 --- a/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc +++ b/ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc @@ -10,14 +10,14 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" -#include "chromeos/services/bluetooth_config/fake_device_pairing_handler.h" -#include "chromeos/services/bluetooth_config/fake_discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash::hid_detection { diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn index 348802fa0c46f4..ce0f8b326dcf19 100644 --- a/ash/public/cpp/BUILD.gn +++ b/ash/public/cpp/BUILD.gn @@ -378,8 +378,8 @@ component("cpp") { "//chromeos/ash/components/audio", "//chromeos/ash/components/audio:in_process_audio_config", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/dbus/power:power_manager_proto", - "//chromeos/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/services/network_config:in_process_instance", "//chromeos/strings:strings_grit", "//chromeos/ui/base", @@ -421,9 +421,9 @@ component("cpp") { "//base", "//chromeos/ash/components/audio/public/mojom", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//chromeos/components/security_token_pin", "//chromeos/crosapi/mojom", - "//chromeos/services/bluetooth_config/public/mojom", "//chromeos/services/network_config/public/mojom", "//components/app_restore", "//components/session_manager:base", diff --git a/ash/public/cpp/bluetooth_config_service.cc b/ash/public/cpp/bluetooth_config_service.cc index 42f65e6ae53623..216918246a4f77 100644 --- a/ash/public/cpp/bluetooth_config_service.cc +++ b/ash/public/cpp/bluetooth_config_service.cc @@ -4,7 +4,7 @@ #include "ash/public/cpp/bluetooth_config_service.h" -#include "chromeos/services/bluetooth_config/in_process_instance.h" +#include "chromeos/ash/services/bluetooth_config/in_process_instance.h" namespace ash { diff --git a/ash/public/cpp/bluetooth_config_service.h b/ash/public/cpp/bluetooth_config_service.h index 8d4df7ab13369f..3d9ea5f952e364 100644 --- a/ash/public/cpp/bluetooth_config_service.h +++ b/ash/public/cpp/bluetooth_config_service.h @@ -6,7 +6,7 @@ #define ASH_PUBLIC_CPP_BLUETOOTH_CONFIG_SERVICE_H_ #include "ash/public/cpp/ash_public_export.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" namespace ash { diff --git a/ash/quick_pair/keyed_service/BUILD.gn b/ash/quick_pair/keyed_service/BUILD.gn index e76755eff7d2bd..6d29f758427308 100644 --- a/ash/quick_pair/keyed_service/BUILD.gn +++ b/ash/quick_pair/keyed_service/BUILD.gn @@ -33,9 +33,9 @@ static_library("keyed_service") { "//ash/quick_pair/ui", "//ash/services/quick_pair", "//base", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//components/keyed_service/core", "//components/prefs", "//components/user_manager", @@ -72,9 +72,9 @@ source_set("unit_tests") { "//ash/services/quick_pair:test_support", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config:test_support", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config:test_support", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//components/prefs:test_support", "//components/user_manager:test_support", "//device/bluetooth", diff --git a/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.cc b/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.cc index 48b433b92611da..eae5948012ead8 100644 --- a/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.cc +++ b/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.cc @@ -6,8 +6,8 @@ #include "ash/quick_pair/repository/fast_pair_repository.h" #include "base/callback_helpers.h" -#include "chromeos/services/bluetooth_config/device_name_manager.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" namespace ash { namespace quick_pair { diff --git a/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.h b/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.h index 54a8b0843e0bcc..2974888f868b63 100644 --- a/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.h +++ b/ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.h @@ -7,7 +7,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace chromeos { diff --git a/ash/quick_pair/keyed_service/quick_pair_mediator.cc b/ash/quick_pair/keyed_service/quick_pair_mediator.cc index 9d9a0a940e7855..3a3e9c364f51f3 100644 --- a/ash/quick_pair/keyed_service/quick_pair_mediator.cc +++ b/ash/quick_pair/keyed_service/quick_pair_mediator.cc @@ -33,7 +33,7 @@ #include "ash/services/quick_pair/quick_pair_process.h" #include "ash/services/quick_pair/quick_pair_process_manager_impl.h" #include "base/threading/thread_task_runner_handle.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "components/prefs/pref_registry_simple.h" namespace ash { diff --git a/ash/quick_pair/keyed_service/quick_pair_mediator.h b/ash/quick_pair/keyed_service/quick_pair_mediator.h index a084b46e0a67b4..cc8cb15ffa0a09 100644 --- a/ash/quick_pair/keyed_service/quick_pair_mediator.h +++ b/ash/quick_pair/keyed_service/quick_pair_mediator.h @@ -15,8 +15,8 @@ #include "ash/quick_pair/ui/ui_broker.h" #include "base/memory/scoped_refptr.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/ash/quick_pair/keyed_service/quick_pair_mediator_unittest.cc b/ash/quick_pair/keyed_service/quick_pair_mediator_unittest.cc index cb4ef3d0313f20..179fa8ee903129 100644 --- a/ash/quick_pair/keyed_service/quick_pair_mediator_unittest.cc +++ b/ash/quick_pair/keyed_service/quick_pair_mediator_unittest.cc @@ -35,10 +35,10 @@ #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "base/memory/scoped_refptr.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "components/prefs/pref_registry.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" diff --git a/ash/quick_pair/repository/BUILD.gn b/ash/quick_pair/repository/BUILD.gn index 9c060c6d97eea8..b83f0f11fa86e0 100644 --- a/ash/quick_pair/repository/BUILD.gn +++ b/ash/quick_pair/repository/BUILD.gn @@ -50,7 +50,7 @@ source_set("repository") { "//ash/services/quick_pair/public/cpp", "//base", "//chromeos/ash/components/network", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/cpp", "//components/image_fetcher/core", "//components/prefs", "//components/signin/public/identity_manager", @@ -91,7 +91,7 @@ static_library("test_support") { "//base", "//base/test:test_support", "//chromeos/ash/components/network:test_support", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/cpp", "//device/bluetooth", "//net", "//net/traffic_annotation:test_support", @@ -128,7 +128,7 @@ source_set("unit_tests") { "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/cpp", "//components/prefs:test_support", "//components/signin/public/identity_manager:test_support", "//crypto", diff --git a/ash/quick_pair/repository/fake_device_metadata_http_fetcher.cc b/ash/quick_pair/repository/fake_device_metadata_http_fetcher.cc index 4a85e56c27deb6..cf461fe2aded51 100644 --- a/ash/quick_pair/repository/fake_device_metadata_http_fetcher.cc +++ b/ash/quick_pair/repository/fake_device_metadata_http_fetcher.cc @@ -8,7 +8,7 @@ #include "base/base64.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "device/bluetooth/bluetooth_device.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" diff --git a/ash/quick_pair/repository/fake_fast_pair_repository.cc b/ash/quick_pair/repository/fake_fast_pair_repository.cc index ca0638b1db6c9e..a8f391e674bd18 100644 --- a/ash/quick_pair/repository/fake_fast_pair_repository.cc +++ b/ash/quick_pair/repository/fake_fast_pair_repository.cc @@ -10,7 +10,7 @@ #include "base/containers/contains.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "device/bluetooth/bluetooth_device.h" namespace ash { diff --git a/ash/quick_pair/repository/fast_pair/device_image_store.cc b/ash/quick_pair/repository/fast_pair/device_image_store.cc index d96fdba1c23f96..a9de3d868fba36 100644 --- a/ash/quick_pair/repository/fast_pair/device_image_store.cc +++ b/ash/quick_pair/repository/fast_pair/device_image_store.cc @@ -9,7 +9,7 @@ #include "ash/quick_pair/proto/fastpair_data.pb.h" #include "ash/quick_pair/repository/fast_pair/fast_pair_image_decoder.h" #include "ash/shell.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" diff --git a/ash/quick_pair/repository/fast_pair/device_image_store.h b/ash/quick_pair/repository/fast_pair/device_image_store.h index 3afdd7fbd37fff..a8416693ac1198 100644 --- a/ash/quick_pair/repository/fast_pair/device_image_store.h +++ b/ash/quick_pair/repository/fast_pair/device_image_store.h @@ -11,7 +11,7 @@ #include "ash/quick_pair/repository/fast_pair/device_metadata.h" #include "base/callback.h" #include "base/values.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/image/image.h" diff --git a/ash/quick_pair/repository/fast_pair/device_image_store_unittest.cc b/ash/quick_pair/repository/fast_pair/device_image_store_unittest.cc index 5a6259dbfecdc0..85c6f99aedca90 100644 --- a/ash/quick_pair/repository/fast_pair/device_image_store_unittest.cc +++ b/ash/quick_pair/repository/fast_pair/device_image_store_unittest.cc @@ -13,7 +13,7 @@ #include "base/callback_helpers.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "components/prefs/pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/quick_pair/repository/fast_pair_repository.h b/ash/quick_pair/repository/fast_pair_repository.h index 414ccdc7c9598f..44fa11508a7aad 100644 --- a/ash/quick_pair/repository/fast_pair_repository.h +++ b/ash/quick_pair/repository/fast_pair_repository.h @@ -11,7 +11,7 @@ #include "ash/quick_pair/repository/fast_pair/pairing_metadata.h" #include "base/callback.h" #include "base/containers/flat_map.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace chromeos { diff --git a/ash/quick_pair/repository/fast_pair_repository_impl.cc b/ash/quick_pair/repository/fast_pair_repository_impl.cc index a213f835cd1b7e..2205e80bf74d5b 100644 --- a/ash/quick_pair/repository/fast_pair_repository_impl.cc +++ b/ash/quick_pair/repository/fast_pair_repository_impl.cc @@ -24,7 +24,7 @@ #include "base/strings/stringprintf.h" #include "chromeos/ash/components/network/network_handler.h" #include "chromeos/ash/components/network/network_state_handler.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "crypto/sha2.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/ash/system/bluetooth/DEPS b/ash/system/bluetooth/DEPS index a0adfffcccb743..d935e89853b5c0 100644 --- a/ash/system/bluetooth/DEPS +++ b/ash/system/bluetooth/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+chromeos/services/bluetooth_config", "+services/device/public", ] diff --git a/ash/system/bluetooth/bluetooth_detailed_view.h b/ash/system/bluetooth/bluetooth_detailed_view.h index 1fd8c9bbbb2fb6..b6499053ea4424 100644 --- a/ash/system/bluetooth/bluetooth_detailed_view.h +++ b/ash/system/bluetooth/bluetooth_detailed_view.h @@ -8,7 +8,7 @@ #include #include "ash/ash_export.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "ui/gfx/vector_icon_types.h" namespace views { diff --git a/ash/system/bluetooth/bluetooth_detailed_view_controller.cc b/ash/system/bluetooth/bluetooth_detailed_view_controller.cc index 7af7dcaeb785df..85fe6b68d18438 100644 --- a/ash/system/bluetooth/bluetooth_detailed_view_controller.cc +++ b/ash/system/bluetooth/bluetooth_detailed_view_controller.cc @@ -12,7 +12,7 @@ #include "ash/system/model/system_tray_model.h" #include "ash/system/unified/unified_system_tray_controller.h" #include "base/check.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "mojo/public/cpp/bindings/clone_traits.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/bluetooth/bluetooth_detailed_view_controller.h b/ash/system/bluetooth/bluetooth_detailed_view_controller.h index 7b38ee9b607ba5..ce248ac058630e 100644 --- a/ash/system/bluetooth/bluetooth_detailed_view_controller.h +++ b/ash/system/bluetooth/bluetooth_detailed_view_controller.h @@ -14,7 +14,7 @@ #include "ash/system/bluetooth/bluetooth_device_list_controller.h" #include "ash/system/tray/detailed_view_delegate.h" #include "ash/system/unified/detailed_view_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/ash/system/bluetooth/bluetooth_detailed_view_controller_unittest.cc b/ash/system/bluetooth/bluetooth_detailed_view_controller_unittest.cc index 0a615b90f142fb..b71a36a5b7be98 100644 --- a/ash/system/bluetooth/bluetooth_detailed_view_controller_unittest.cc +++ b/ash/system/bluetooth/bluetooth_detailed_view_controller_unittest.cc @@ -22,11 +22,11 @@ #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" -#include "chromeos/services/bluetooth_config/fake_device_operation_handler.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "mojo/public/cpp/bindings/clone_traits.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/system/bluetooth/bluetooth_device_list_controller.h b/ash/system/bluetooth/bluetooth_device_list_controller.h index d27943f3affabd..126f8e72eaa589 100644 --- a/ash/system/bluetooth/bluetooth_device_list_controller.h +++ b/ash/system/bluetooth/bluetooth_device_list_controller.h @@ -9,7 +9,7 @@ #include #include "ash/ash_export.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace ash { diff --git a/ash/system/bluetooth/bluetooth_device_list_controller_impl.h b/ash/system/bluetooth/bluetooth_device_list_controller_impl.h index 521693c54b3056..2aaa4f1c995f30 100644 --- a/ash/system/bluetooth/bluetooth_device_list_controller_impl.h +++ b/ash/system/bluetooth/bluetooth_device_list_controller_impl.h @@ -11,7 +11,7 @@ #include "ash/ash_export.h" #include "ash/system/bluetooth/bluetooth_device_list_controller.h" #include "base/containers/flat_map.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace views { class Separator; diff --git a/ash/system/bluetooth/bluetooth_device_list_controller_unittest.cc b/ash/system/bluetooth/bluetooth_device_list_controller_unittest.cc index d3d0b6de778def..729f81461f33b5 100644 --- a/ash/system/bluetooth/bluetooth_device_list_controller_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_list_controller_unittest.cc @@ -16,7 +16,7 @@ #include "ash/system/tray/tri_view.h" #include "ash/test/ash_test_base.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" #include "ui/views/controls/separator.h" diff --git a/ash/system/bluetooth/bluetooth_device_list_item_battery_view.h b/ash/system/bluetooth/bluetooth_device_list_item_battery_view.h index a386794fce00d8..608a8ce051fb9b 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_battery_view.h +++ b/ash/system/bluetooth/bluetooth_device_list_item_battery_view.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "ash/system/power/power_status.h" #include "ash/system/tray/hover_highlight_view.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace views { diff --git a/ash/system/bluetooth/bluetooth_device_list_item_battery_view_unittest.cc b/ash/system/bluetooth/bluetooth_device_list_item_battery_view_unittest.cc index b914ce5190417b..57d05617ed00d8 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_battery_view_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_list_item_battery_view_unittest.cc @@ -10,7 +10,7 @@ #include "ash/test/ash_test_base.h" #include "base/strings/string_number_conversions.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h" diff --git a/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view.h b/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view.h index c1a12c74ea7caf..d23a32f3ef208f 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view.h +++ b/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/system/bluetooth/bluetooth_device_list_item_battery_view.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace ash { diff --git a/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view_unittest.cc b/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view_unittest.cc index 6efc13ef462c2e..86fdff21d183e8 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_list_item_multiple_battery_view_unittest.cc @@ -10,7 +10,7 @@ #include "ash/test/ash_test_base.h" #include "base/strings/string_number_conversions.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/ash/system/bluetooth/bluetooth_device_list_item_view.cc b/ash/system/bluetooth/bluetooth_device_list_item_view.cc index 895a7cf466a761..77a170bfc32f30 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_view.cc +++ b/ash/system/bluetooth/bluetooth_device_list_item_view.cc @@ -16,7 +16,7 @@ #include "base/check.h" #include "base/notreached.h" #include "base/strings/strcat.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "chromeos/strings/grit/chromeos_strings.h" #include "chromeos/ui/vector_icons/vector_icons.h" #include "mojo/public/cpp/bindings/clone_traits.h" diff --git a/ash/system/bluetooth/bluetooth_device_list_item_view.h b/ash/system/bluetooth/bluetooth_device_list_item_view.h index c69108cd9fa188..9abba4828df0cb 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_view.h +++ b/ash/system/bluetooth/bluetooth_device_list_item_view.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/system/tray/hover_highlight_view.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace ash { diff --git a/ash/system/bluetooth/bluetooth_device_list_item_view_unittest.cc b/ash/system/bluetooth/bluetooth_device_list_item_view_unittest.cc index 9d50d2f8facac8..e57cc413942e5e 100644 --- a/ash/system/bluetooth/bluetooth_device_list_item_view_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_list_item_view_unittest.cc @@ -20,7 +20,7 @@ #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/strings/grit/chromeos_strings.h" #include "chromeos/ui/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc b/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc index e9fea802afc405..65c847634ffbc8 100644 --- a/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc +++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/check.h" #include "base/threading/thread_task_runner_handle.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "device/bluetooth/chromeos/bluetooth_utils.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler.h b/ash/system/bluetooth/bluetooth_device_status_ui_handler.h index c65045e7520d88..4419ecda79861e 100644 --- a/ash/system/bluetooth/bluetooth_device_status_ui_handler.h +++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/public/cpp/system/toast_manager.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc index 05d59270b8c25b..3d7959d62be118 100644 --- a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc @@ -10,8 +10,8 @@ #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "testing/gmock/include/gmock/gmock.h" using chromeos::bluetooth_config::mojom::BatteryProperties; diff --git a/ash/system/bluetooth/bluetooth_feature_pod_controller.cc b/ash/system/bluetooth/bluetooth_feature_pod_controller.cc index 06c5b0ff376e76..f045749e1ae160 100644 --- a/ash/system/bluetooth/bluetooth_feature_pod_controller.cc +++ b/ash/system/bluetooth/bluetooth_feature_pod_controller.cc @@ -13,7 +13,7 @@ #include "base/check.h" #include "base/i18n/number_formatting.h" #include "base/strings/string_number_conversions.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "mojo/public/cpp/bindings/clone_traits.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/bluetooth/bluetooth_feature_pod_controller.h b/ash/system/bluetooth/bluetooth_feature_pod_controller.h index b1526cef9ed5a1..578cc2ce327615 100644 --- a/ash/system/bluetooth/bluetooth_feature_pod_controller.h +++ b/ash/system/bluetooth/bluetooth_feature_pod_controller.h @@ -9,7 +9,7 @@ #include "ash/system/tray/system_tray_item_uma_type.h" #include "ash/system/unified/feature_pod_controller_base.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc b/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc index 191ac99de80467..399d8fa5bf3c52 100644 --- a/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc +++ b/ash/system/bluetooth/bluetooth_feature_pod_controller_unittest.cc @@ -23,10 +23,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "ui/base/l10n/l10n_util.h" using chromeos::bluetooth_config::ScopedBluetoothConfigTestHelper; diff --git a/ash/system/bluetooth/fake_bluetooth_device_list_controller.h b/ash/system/bluetooth/fake_bluetooth_device_list_controller.h index a824e41f2d95b2..23e546ee37e1d1 100644 --- a/ash/system/bluetooth/fake_bluetooth_device_list_controller.h +++ b/ash/system/bluetooth/fake_bluetooth_device_list_controller.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/system/bluetooth/bluetooth_device_list_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/ash/system/network/DEPS b/ash/system/network/DEPS index b41e94c24ad6bb..a7c1ece4c33b94 100644 --- a/ash/system/network/DEPS +++ b/ash/system/network/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+chromeos/ash/components/dbus/hermes", - "+chromeos/services/bluetooth_config", "+chromeos/services/network_config/public", "+components/device_event_log", "+components/onc", diff --git a/ash/system/network/network_detailed_view_controller.h b/ash/system/network/network_detailed_view_controller.h index 1de70b751eff07..1aa564afb373d9 100644 --- a/ash/system/network/network_detailed_view_controller.h +++ b/ash/system/network/network_detailed_view_controller.h @@ -15,7 +15,7 @@ #include "ash/system/network/network_list_view_controller.h" #include "ash/system/tray/detailed_view_delegate.h" #include "ash/system/unified/detailed_view_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/ash/system/network/network_detailed_view_controller_unittest.cc b/ash/system/network/network_detailed_view_controller_unittest.cc index 2a8cfcc78e75e8..9d94d5f9024975 100644 --- a/ash/system/network/network_detailed_view_controller_unittest.cc +++ b/ash/system/network/network_detailed_view_controller_unittest.cc @@ -19,8 +19,8 @@ #include "chromeos/ash/components/network/network_connect.h" #include "chromeos/ash/components/network/network_handler.h" #include "chromeos/ash/components/network/network_state_handler.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_test_helper.h" #include "third_party/cros_system_api/dbus/shill/dbus-constants.h" diff --git a/ash/system/network/network_list_view_controller_impl.h b/ash/system/network/network_list_view_controller_impl.h index 5ec45ee6ad85a9..d1669ae9e9e8dd 100644 --- a/ash/system/network/network_list_view_controller_impl.h +++ b/ash/system/network/network_list_view_controller_impl.h @@ -19,7 +19,7 @@ #include "ash/system/tray/tray_utils.h" #include "ash/system/tray/tri_view.h" #include "base/timer/timer.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/system/network/network_list_view_controller_unittest.cc b/ash/system/network/network_list_view_controller_unittest.cc index 37e2abd5e81dc0..22ba9f830bfc2f 100644 --- a/ash/system/network/network_list_view_controller_unittest.cc +++ b/ash/system/network/network_list_view_controller_unittest.cc @@ -29,9 +29,9 @@ #include "chromeos/ash/components/network/network_state.h" #include "chromeos/ash/components/network/network_state_handler.h" #include "chromeos/ash/components/network/network_type_pattern.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_test_helper.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" diff --git a/ash/system/network/network_section_header_view.h b/ash/system/network/network_section_header_view.h index 72559ad3a6025c..24b20ab1de9f44 100644 --- a/ash/system/network/network_section_header_view.h +++ b/ash/system/network/network_section_header_view.h @@ -11,7 +11,7 @@ #include "ash/system/tray/tri_view.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom-forward.h" #include "mojo/public/cpp/bindings/remote.h" #include "ui/views/controls/button/toggle_button.h" diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h index b5124d59d4e906..74090db7c43847 100644 --- a/ash/test/ash_test_helper.h +++ b/ash/test/ash_test_helper.h @@ -17,7 +17,7 @@ #include "ash/shell_delegate.h" #include "ash/system/message_center/test_notifier_settings_controller.h" #include "base/test/scoped_command_line.h" -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" #include "chromeos/system/fake_statistics_provider.h" #include "ui/aura/test/aura_test_helper.h" diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 4db100ac9f5af1..ab872aa0b7ee6a 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -5231,6 +5231,8 @@ static_library("browser") { "//chromeos/ash/components/sync_wifi", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/auth_factor_config", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//chromeos/ash/services/cros_healthd/public/cpp", "//chromeos/ash/services/cros_healthd/public/mojom", "//chromeos/components/onc", @@ -5241,8 +5243,6 @@ static_library("browser") { "//chromeos/dbus/tpm_manager", "//chromeos/dbus/tpm_manager:tpm_manager_proto", "//chromeos/login/login_state", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config/public/mojom", "//chromeos/services/hotspot_config/public/mojom", "//chromeos/services/network_config", "//chromeos/services/network_config:in_process_instance", diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn index c793342d0f2435..9b77b0b0344a7d 100644 --- a/chrome/browser/ash/BUILD.gn +++ b/chrome/browser/ash/BUILD.gn @@ -1874,6 +1874,7 @@ source_set("ash") { "//chromeos/ash/components/trash_service/public/cpp", "//chromeos/ash/components/trash_service/public/mojom", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/ash/services/cros_healthd/private/cpp", "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_browser", "//chromeos/components/disks:prefs", @@ -1889,7 +1890,6 @@ source_set("ash") { "//chromeos/dbus/permission_broker", "//chromeos/dbus/u2f", "//chromeos/ime:gencode", - "//chromeos/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/services/machine_learning/public/cpp", "//chromeos/services/network_config:in_process_instance", "//chromeos/services/network_config/public/cpp", diff --git a/chrome/browser/ash/net/bluetooth_pref_state_observer.cc b/chrome/browser/ash/net/bluetooth_pref_state_observer.cc index e15a2c1fa01506..37ca2dce75fab2 100644 --- a/chrome/browser/ash/net/bluetooth_pref_state_observer.cc +++ b/chrome/browser/ash/net/bluetooth_pref_state_observer.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" -#include "chromeos/services/bluetooth_config/in_process_instance.h" +#include "chromeos/ash/services/bluetooth_config/in_process_instance.h" #include "components/device_event_log/device_event_log.h" namespace ash { diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc index 05471e862955c2..d050fcd62948d6 100644 --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc @@ -286,7 +286,7 @@ #include "chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom.h" #include "chromeos/ash/components/local_search_service/public/mojom/index.mojom.h" #include "chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" // nogncheck #include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h" // nogncheck #include "chromeos/services/network_health/public/mojom/network_health.mojom.h" // nogncheck diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 54c2e461d79d33..0e9cd4857c7c86 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -334,6 +334,7 @@ source_set("chromeos") { "//chromeos/ash/components/sync_wifi", "//chromeos/ash/services/assistant:lib", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/ash/services/cros_healthd/private/cpp", "//chromeos/ash/services/cros_healthd/public/cpp", "//chromeos/ash/services/cros_healthd/public/mojom", @@ -368,7 +369,6 @@ source_set("chromeos") { "//chromeos/ime:gencode", "//chromeos/login/login_state", "//chromeos/printing", - "//chromeos/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/services/machine_learning/public/cpp", "//chromeos/services/machine_learning/public/mojom", "//chromeos/services/network_config:in_process_instance", diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index db57379fb0f6e6..fcdf8003dd52e4 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -401,9 +401,9 @@ #include "chromeos/ash/components/network/network_metadata_store.h" #include "chromeos/ash/components/network/proxy/proxy_config_handler.h" #include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h" -#include "chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h" -#include "chromeos/services/bluetooth_config/device_name_manager_impl.h" #include "components/account_manager_core/chromeos/account_manager.h" #include "components/onc/onc_pref_names.h" #include "components/quirks/quirks_manager.h" diff --git a/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn b/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn index ace7d1a2261980..9911957279b941 100644 --- a/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn +++ b/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn @@ -34,7 +34,7 @@ if (optimize_webui) { "chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom-lite.js", "chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js", "chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-webui.js", - "chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", + "chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", "chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js", ] } diff --git a/chrome/browser/resources/settings/chromeos/BUILD.gn b/chrome/browser/resources/settings/chromeos/BUILD.gn index 473a49b5dd9d95..e30115dfd1731b 100644 --- a/chrome/browser/resources/settings/chromeos/BUILD.gn +++ b/chrome/browser/resources/settings/chromeos/BUILD.gn @@ -67,7 +67,7 @@ if (optimize_webui) { "chrome://resources/mojo/ash/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js", "chrome://resources/mojo/ash/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js", "chrome://resources/mojo/chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-webui.js", - "chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", + "chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js", "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js", "chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-lite.js", diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn index 3758308eca0455..0bf0e302fb2c58 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn @@ -33,7 +33,7 @@ js_library("os_bluetooth_page") { ":os_bluetooth_devices_subpage", ":os_bluetooth_pairing_dialog", ":os_bluetooth_summary", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config", "//ui/webui/resources/js:i18n_behavior.m", @@ -49,7 +49,7 @@ js_library("os_bluetooth_devices_subpage") { "..:os_route", "..:route_observer_behavior", "../..:router", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_metrics_utils", "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config", @@ -70,7 +70,7 @@ js_library("os_bluetooth_summary") { "..:route_observer_behavior", "..:route_origin_behavior", "../..:router", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils", "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config", @@ -81,7 +81,7 @@ js_library("os_bluetooth_summary") { js_library("os_paired_bluetooth_list") { deps = [ ":os_paired_bluetooth_list_item", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_elements:cr_scrollable_behavior", @@ -92,7 +92,7 @@ js_library("os_paired_bluetooth_list_item") { deps = [ "..:os_route", "../..:router", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_icon", @@ -103,7 +103,7 @@ js_library("os_paired_bluetooth_list_item") { js_library("os_bluetooth_true_wireless_images") { deps = [ - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils", "//ui/webui/resources/js:i18n_behavior.m", @@ -119,7 +119,7 @@ js_library("os_bluetooth_device_detail_subpage") { "..:route_observer_behavior", "..:route_origin_behavior", "../..:router", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_metrics_utils", @@ -138,7 +138,7 @@ js_library("os_bluetooth_saved_devices_subpage") { "..:route_observer_behavior", "..:route_origin_behavior", "../..:router", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_metrics_utils", @@ -149,7 +149,7 @@ js_library("os_bluetooth_saved_devices_subpage") { js_library("os_bluetooth_change_device_name_dialog") { deps = [ - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils", "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config", diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_change_device_name_dialog.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_change_device_name_dialog.js index be70ee838e835a..2e89b755901c9c 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_change_device_name_dialog.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_change_device_name_dialog.js @@ -13,7 +13,7 @@ import 'chrome://resources/cr_elements/cr_input/cr_input.js'; import {getDeviceName} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; import {getBluetoothConfig} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; -import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; /** @type {number} */ diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.js index 1215ab316c7054..526b4be18b20b3 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.js @@ -22,7 +22,7 @@ import {getBluetoothConfig} from 'chrome://resources/cr_components/chromeos/blue import {assertNotReached} from 'chrome://resources/js/assert.m.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/js/web_ui_listener_behavior.m.js'; -import {AudioOutputCapability, BluetoothSystemProperties, DeviceConnectionState, DeviceType, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothSystemProperties, DeviceConnectionState, DeviceType, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {Route, Router} from '../../router.js'; diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.js index 84a2ca77c33206..244f4eb2f7d914 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.js @@ -17,7 +17,7 @@ import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_element import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/js/web_ui_listener_behavior.m.js'; -import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {Setting} from '../../mojom-webui/setting.mojom-webui.js'; diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.js index b784b2d7dc4151..c59424b1632b6e 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.js @@ -11,7 +11,7 @@ import 'chrome://resources/cr_elements/cr_input/cr_input.js'; import {getDeviceName} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; -import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../../i18n_setup.js'; diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_page.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_page.js index 0cba9732861e05..bcad65eeb25c24 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_page.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_page.js @@ -19,7 +19,7 @@ import './os_bluetooth_pairing_dialog.js'; import {getBluetoothConfig} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; -import {BluetoothSystemProperties, BluetoothSystemState, SystemPropertiesObserverInterface, SystemPropertiesObserverReceiver} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemProperties, BluetoothSystemState, SystemPropertiesObserverInterface, SystemPropertiesObserverReceiver} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; /** diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.js index ad5c8cb8eef185..7c5bb72af0479a 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.js @@ -16,7 +16,7 @@ import {getDeviceName} from 'chrome://resources/cr_components/chromeos/bluetooth import {getBluetoothConfig} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; -import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../../i18n_setup.js'; diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_true_wireless_images.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_true_wireless_images.js index 933477da5e1482..768f883b65f24a 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_true_wireless_images.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_true_wireless_images.js @@ -15,7 +15,7 @@ import {BatteryType} from 'chrome://resources/cr_components/chromeos/bluetooth/b import {getBatteryPercentage, hasAnyDetailedBatteryInfo, hasDefaultImage, hasTrueWirelessImages} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; import {assertNotReached} from 'chrome://resources/js/assert.m.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; -import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; /** diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list.js index 9e16311bf44bc3..8a2eb904567a58 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list.js @@ -12,7 +12,7 @@ import './os_paired_bluetooth_list_item.js'; import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; import {CrScrollableBehavior, CrScrollableBehaviorInterface} from 'chrome://resources/cr_elements/cr_scrollable_behavior.js'; -import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; /** diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.js b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.js index 326a0e5860b3f7..ff6a18d130fbcc 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.js +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.js @@ -20,7 +20,7 @@ import {getBatteryPercentage, getDeviceName, hasAnyDetailedBatteryInfo} from 'ch import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js'; import {FocusRowBehavior, FocusRowBehaviorInterface} from 'chrome://resources/js/cr/ui/focus_row_behavior.js'; import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/js/i18n_behavior.m.js'; -import {DeviceConnectionState, DeviceType, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {DeviceConnectionState, DeviceType, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {Router} from '../../router.js'; diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 3d3bf9c49d7a2b..840d938eb9a2d4 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -3199,6 +3199,9 @@ static_library("ui") { "//chromeos/ash/services/assistant/public/mojom", "//chromeos/ash/services/assistant/public/proto", "//chromeos/ash/services/auth_factor_config", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//chromeos/components/onc", "//chromeos/components/quick_answers", "//chromeos/components/quick_answers/public/cpp:cpp", @@ -3212,9 +3215,6 @@ static_library("ui") { "//chromeos/login/login_state", "//chromeos/printing", "//chromeos/services/assistant/public/shared", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config:in_process_bluetooth_config", - "//chromeos/services/bluetooth_config/public/mojom", "//chromeos/services/network_config/public/cpp", "//chromeos/services/network_config/public/mojom", "//chromeos/services/network_health/public/mojom", diff --git a/chrome/browser/ui/ash/assistant/device_actions.h b/chrome/browser/ui/ash/assistant/device_actions.h index 2019fb0d553fe3..1327ef2f03bfc6 100644 --- a/chrome/browser/ui/ash/assistant/device_actions.h +++ b/chrome/browser/ui/ash/assistant/device_actions.h @@ -15,7 +15,7 @@ #include "chrome/browser/ui/ash/assistant/device_actions_delegate.h" #include "chromeos/ash/services/assistant/public/cpp/assistant_service.h" #include "chromeos/ash/services/assistant/public/cpp/device_actions.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote_set.h" diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc index b174dc290057e2..e3b414bee482fb 100644 --- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc @@ -64,10 +64,10 @@ #include "chrome/browser/ui/views/tabs/tab_scrubber_chromeos.h" #include "chromeos/ash/components/network/network_connect.h" #include "chromeos/ash/components/network/portal_detector/network_portal_detector.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/in_process_instance.h" #include "chromeos/components/quick_answers/public/cpp/controller/quick_answers_controller.h" #include "chromeos/components/quick_answers/quick_answers_client.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/in_process_instance.h" #include "components/crash/core/common/crash_key.h" #include "components/session_manager/core/session_manager.h" #include "components/session_manager/core/session_manager_observer.h" diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h index 433fa64d4f0f61..817fd5d389027a 100644 --- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h +++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h @@ -9,7 +9,7 @@ #include "base/strings/string_piece.h" #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-forward.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-forward.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/settings/ash/os_settings_ui.h b/chrome/browser/ui/webui/settings/ash/os_settings_ui.h index b15f8e9257a288..5ccc4ff7530e25 100644 --- a/chrome/browser/ui/webui/settings/ash/os_settings_ui.h +++ b/chrome/browser/ui/webui/settings/ash/os_settings_ui.h @@ -20,7 +20,7 @@ #include "chrome/browser/ui/webui/webui_load_timer.h" #include "chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom-forward.h" #include "chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-forward.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-forward.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-forward.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom-forward.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/BUILD.gn b/chrome/test/data/webui/cr_components/chromeos/bluetooth/BUILD.gn index 1801d727f5a521..9e0f09e842dd57 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/BUILD.gn +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/BUILD.gn @@ -34,7 +34,7 @@ js_library("bluetooth_pairing_ui_test") { deps = [ ":fake_bluetooth_config", "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_pairing_ui", ] externs_list = [ "$externs_path/mocha-2.5.js" ] @@ -43,7 +43,7 @@ js_library("bluetooth_pairing_ui_test") { js_library("bluetooth_icon_test") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_icon", ] externs_list = [ "$externs_path/mocha-2.5.js" ] @@ -60,7 +60,7 @@ js_library("bluetooth_base_page_test") { js_library("bluetooth_battery_icon_percentage_tests") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_battery_icon_percentage", ] externs_list = [ "$externs_path/mocha-2.5.js" ] @@ -69,7 +69,7 @@ js_library("bluetooth_battery_icon_percentage_tests") { js_library("bluetooth_device_battery_info_tests") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info", ] externs_list = [ "$externs_path/mocha-2.5.js" ] @@ -90,7 +90,7 @@ js_library("bluetooth_pairing_device_item_test") { js_library("bluetooth_pairing_device_selection_page_test") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_pairing_device_selection_page", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_types", ] @@ -100,7 +100,7 @@ js_library("bluetooth_pairing_device_selection_page_test") { js_library("bluetooth_pairing_request_code_page_test") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_pairing_request_code_page", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_types", ] @@ -114,7 +114,7 @@ js_library("bluetooth_pairing_enter_code_page_test") { deps = [ ":fake_bluetooth_config", "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_pairing_enter_code_page", ] externs_list = [ "$externs_path/mocha-2.5.js" ] @@ -139,14 +139,16 @@ js_library("bluetooth_spinner_page_test") { js_library("fake_bluetooth_config") { deps = [ "../../..:chai_assert", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", ] } js_library("fake_device_pairing_handler") { - deps = [ "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js" ] + deps = + [ "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js" ] } js_library("fake_bluetooth_discovery_delegate") { - deps = [ "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js" ] + deps = + [ "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js" ] } diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage_tests.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage_tests.js index 9704a9ccb6a846..9cd258c04af331 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage_tests.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage_tests.js @@ -6,7 +6,7 @@ import 'chrome://bluetooth-pairing/strings.m.js'; import {BluetoothBatteryIconPercentageElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage.js'; import {BatteryType} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; -import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_device_battery_info_tests.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_device_battery_info_tests.js index f2f80a69fc3830..65ed0b0db61946 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_device_battery_info_tests.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_device_battery_info_tests.js @@ -5,7 +5,7 @@ import 'chrome://bluetooth-pairing/strings.m.js'; import {BluetoothDeviceBatteryInfoElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_device_battery_info.js'; -import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertFalse, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_icon_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_icon_test.js index 483457be48e354..6ed5172c64b3e2 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_icon_test.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_icon_test.js @@ -3,7 +3,7 @@ // found in the LICENSE file. import {SettingsBluetoothIconElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_icon.js'; -import {AudioOutputCapability, BluetoothDeviceProperties, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothDeviceProperties, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertFalse, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item_test.js index 2be387efb259fd..1ea18720dc7994 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item_test.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item_test.js @@ -6,7 +6,7 @@ import 'chrome://bluetooth-pairing/strings.m.js'; import {SettingsBluetoothPairingDeviceItemElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item.js'; import {DeviceItemState} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; -import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page_test.js index cb665c4a078354..296f4c3d52e292 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page_test.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page_test.js @@ -7,7 +7,7 @@ import 'chrome://bluetooth-pairing/strings.m.js'; import {SettingsBluetoothPairingDeviceSelectionPageElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page.js'; import {DeviceItemState} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {AudioOutputCapability, BluetoothDeviceProperties, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothDeviceProperties, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertFalse, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page_test.js index 448d9a35d49f06..55b3c98b8a6188 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page_test.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page_test.js @@ -7,12 +7,11 @@ import 'chrome://bluetooth-pairing/strings.m.js'; import {SettingsBluetoothRequestCodePageElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page.js'; import {ButtonState, PairingAuthType} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.m.js'; -import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertTrue} from '../../../chai_assert.js'; -import {eventToPromise} from '../../../test_util.js'; -import {waitAfterNextRender} from '../../../test_util.js'; +import {eventToPromise, waitAfterNextRender} from '../../../test_util.js'; import {createDefaultBluetoothDevice} from './fake_bluetooth_config.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js index 13641d42f79481..8e5cc5db7752d6 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/bluetooth_pairing_ui_test.js @@ -12,11 +12,10 @@ import {SettingsBluetoothPairingUiElement} from 'chrome://resources/cr_component import {SettingsBluetoothSpinnerPageElement} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_spinner_page.js'; import {PairingAuthType} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {AudioOutputCapability, BluetoothDeviceProperties, BluetoothSystemState, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothDeviceProperties, BluetoothSystemState, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {assertEquals, assertFalse, assertTrue} from '../../../chai_assert.js'; -import {eventToPromise, flushTasks} from '../../../test_util.js'; -import {waitAfterNextRender} from '../../../test_util.js'; +import {eventToPromise, flushTasks, waitAfterNextRender} from '../../../test_util.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from './fake_bluetooth_config.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_config.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_config.js index 83d5a18b716dc8..5f4620de0745b7 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_config.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_config.js @@ -3,7 +3,7 @@ // found in the LICENSE file. import {stringToMojoString16} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; -import {AudioOutputCapability, BluetoothDeviceProperties, BluetoothDeviceStatusObserverInterface, BluetoothDiscoveryDelegateInterface, BluetoothModificationState, BluetoothSystemProperties, BluetoothSystemState, CrosBluetoothConfigInterface, DeviceConnectionState, DevicePairingHandlerReceiver, DeviceType, DiscoverySessionStatusObserverInterface, PairedBluetoothDeviceProperties, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothDeviceProperties, BluetoothDeviceStatusObserverInterface, BluetoothDiscoveryDelegateInterface, BluetoothModificationState, BluetoothSystemProperties, BluetoothSystemState, CrosBluetoothConfigInterface, DeviceConnectionState, DevicePairingHandlerReceiver, DeviceType, DiscoverySessionStatusObserverInterface, PairedBluetoothDeviceProperties, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {assertFalse, assertNotReached, assertTrue} from '../../../chai_assert.js'; diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_discovery_delegate.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_discovery_delegate.js index 156bb92f56ca58..5671fbd50a4c70 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_discovery_delegate.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_bluetooth_discovery_delegate.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {BluetoothDeviceProperties, BluetoothDiscoveryDelegateInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, BluetoothDiscoveryDelegateInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; /** * @fileoverview Fake implementation of BluetoothDiscoveryDelegate for diff --git a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_device_pairing_handler.js b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_device_pairing_handler.js index e58d2993a3bbe3..4238b429d90c64 100644 --- a/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_device_pairing_handler.js +++ b/chrome/test/data/webui/cr_components/chromeos/bluetooth/fake_device_pairing_handler.js @@ -4,7 +4,7 @@ import {PairingAuthType} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; import {assert} from 'chrome://resources/js/assert.m.js'; -import {BluetoothDeviceProperties, DevicePairingDelegateInterface, DevicePairingHandlerInterface, KeyEnteredHandlerPendingReceiver, KeyEnteredHandlerRemote, PairingResult} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DevicePairingDelegateInterface, DevicePairingHandlerInterface, KeyEnteredHandlerPendingReceiver, KeyEnteredHandlerRemote, PairingResult} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; /** * @fileoverview Fake implementation of DevicePairingHandler for testing. diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_change_device_name_dialog_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_change_device_name_dialog_tests.js index e9e4acdf625947..ab0eb8bb1b5951 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_change_device_name_dialog_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_change_device_name_dialog_tests.js @@ -7,7 +7,7 @@ import 'chrome://os-settings/strings.m.js'; import {getDeviceName} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js index 52d79cbd6de0bb..b259770a32ef6d 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js @@ -6,7 +6,7 @@ import 'chrome://os-settings/strings.m.js'; import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {AudioOutputCapability, BluetoothSystemProperties, DeviceConnectionState, DeviceType, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, BluetoothSystemProperties, DeviceConnectionState, DeviceType, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise, waitBeforeNextRender} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_devices_subpage_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_devices_subpage_tests.js index a1d50fb807b319..f05815aa1964c5 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_devices_subpage_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_devices_subpage_tests.js @@ -7,7 +7,7 @@ import 'chrome://os-settings/strings.m.js'; import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.m.js'; -import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise, isVisible, waitAfterNextRender} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_page_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_page_tests.js index 7b70c7ba624b30..dfd3ab610e0663 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_page_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_page_tests.js @@ -6,7 +6,7 @@ import 'chrome://os-settings/strings.m.js'; import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {BluetoothSystemState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {FakeBluetoothConfig} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_summary_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_summary_tests.js index 173c99875a0f66..4674b97402d572 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_summary_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_summary_tests.js @@ -7,7 +7,7 @@ import 'chrome://os-settings/strings.m.js'; import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; import {mojoString16ToString} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_utils.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js'; -import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise, waitBeforeNextRender} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_true_wireless_images_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_true_wireless_images_tests.js index f9f3835bd61fa9..e87022260f2c0b 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_true_wireless_images_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_true_wireless_images_tests.js @@ -6,7 +6,7 @@ import 'chrome://os-settings/chromeos/os_settings.js'; import 'chrome://os-settings/strings.m.js'; import {BatteryType} from 'chrome://resources/cr_components/chromeos/bluetooth/bluetooth_types.js'; -import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_item_tests.js b/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_item_tests.js index 6d282f24427fb6..7af5523a088dad 100644 --- a/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_item_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_item_tests.js @@ -5,7 +5,7 @@ import 'chrome://os-settings/strings.m.js'; import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; -import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {AudioOutputCapability, DeviceConnectionState, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_tests.js b/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_tests.js index 99d8a04103252e..d225b6538b3779 100644 --- a/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_paired_bluetooth_list_tests.js @@ -5,7 +5,7 @@ import 'chrome://os-settings/chromeos/os_settings.js'; import 'chrome://os-settings/strings.m.js'; -import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_saved_devices_list_tests.js b/chrome/test/data/webui/settings/chromeos/os_saved_devices_list_tests.js index eca0958657eeec..12a21c73ff8f2b 100644 --- a/chrome/test/data/webui/settings/chromeos/os_saved_devices_list_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_saved_devices_list_tests.js @@ -6,7 +6,7 @@ import 'chrome://os-settings/chromeos/os_settings.js'; import 'chrome://os-settings/strings.m.js'; import {OsBluetoothDevicesSubpageBrowserProxyImpl} from 'chrome://os-settings/chromeos/os_settings.js'; -import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise, isVisible} from 'chrome://test/test_util.js'; diff --git a/chrome/test/data/webui/settings/chromeos/os_saved_devices_subpage_tests.js b/chrome/test/data/webui/settings/chromeos/os_saved_devices_subpage_tests.js index d7f9d8258cd0db..2aee462f42bdaa 100644 --- a/chrome/test/data/webui/settings/chromeos/os_saved_devices_subpage_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_saved_devices_subpage_tests.js @@ -6,7 +6,7 @@ import 'chrome://os-settings/chromeos/os_settings.js'; import 'chrome://os-settings/strings.m.js'; import {FastPairSavedDevicesOptInStatus, OsBluetoothDevicesSubpageBrowserProxyImpl, Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; -import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {DeviceConnectionState} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {createDefaultBluetoothDevice} from 'chrome://test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {eventToPromise, isVisible, waitAfterNextRender} from 'chrome://test/test_util.js'; diff --git a/chromeos/ash/components/network/docs/cros_connectivity_layers.svg b/chromeos/ash/components/network/docs/cros_connectivity_layers.svg index 2cc831b8fba16a..2b765afaa95574 100644 --- a/chromeos/ash/components/network/docs/cros_connectivity_layers.svg +++ b/chromeos/ash/components/network/docs/cros_connectivity_layers.svg @@ -1 +1 @@ - + diff --git a/chromeos/ash/resources/BUILD.gn b/chromeos/ash/resources/BUILD.gn index 5bad8e5de12119..c27ab290f988c8 100644 --- a/chromeos/ash/resources/BUILD.gn +++ b/chromeos/ash/resources/BUILD.gn @@ -34,5 +34,6 @@ grit("resources") { "//chromeos/ash/components/human_presence:human_presence_internals_ts", "//chromeos/ash/components/language/public/mojom:mojom_js", "//chromeos/ash/services/auth_factor_config/public/mojom:mojom_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_js", ] } diff --git a/chromeos/ash/resources/ash_resources.grd b/chromeos/ash/resources/ash_resources.grd index 0bb92f89195c60..46a913d1c20407 100644 --- a/chromeos/ash/resources/ash_resources.grd +++ b/chromeos/ash/resources/ash_resources.grd @@ -13,6 +13,7 @@ + diff --git a/chromeos/ash/resources/bluetooth_config_resources.grdp b/chromeos/ash/resources/bluetooth_config_resources.grdp new file mode 100644 index 00000000000000..1e73f1c184960b --- /dev/null +++ b/chromeos/ash/resources/bluetooth_config_resources.grdp @@ -0,0 +1,8 @@ + + + + diff --git a/chromeos/ash/services/BUILD.gn b/chromeos/ash/services/BUILD.gn index e4ceec8a183730..2460bd3d9398f7 100644 --- a/chromeos/ash/services/BUILD.gn +++ b/chromeos/ash/services/BUILD.gn @@ -17,6 +17,7 @@ assert(is_chromeos_ash) source_set("unit_tests") { testonly = true deps = [ + "//chromeos/ash/services/bluetooth_config:unit_tests", "//chromeos/ash/services/cros_healthd/private/cpp:unit_tests", "//chromeos/ash/services/cros_healthd/public/cpp:unit_tests", ] diff --git a/chromeos/services/bluetooth_config/BUILD.gn b/chromeos/ash/services/bluetooth_config/BUILD.gn similarity index 91% rename from chromeos/services/bluetooth_config/BUILD.gn rename to chromeos/ash/services/bluetooth_config/BUILD.gn index b5762f24e1373e..6511c9b7e0522a 100644 --- a/chromeos/services/bluetooth_config/BUILD.gn +++ b/chromeos/ash/services/bluetooth_config/BUILD.gn @@ -2,7 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") +import("//build/config/chromeos/ui_mode.gni") + +assert(is_chromeos_ash) static_library("bluetooth_config") { sources = [ @@ -61,9 +63,9 @@ static_library("bluetooth_config") { "//ash/constants", "//ash/services/nearby/public/cpp", "//base", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//chromeos/dbus/power", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", "//components/device_event_log", "//components/pref_registry", "//components/prefs:prefs", @@ -85,7 +87,7 @@ component("in_process_bluetooth_config") { public_deps = [ "//ash/constants", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//mojo/public/cpp/bindings", ] @@ -140,8 +142,8 @@ static_library("test_support") { ":bluetooth_config", ":in_process_bluetooth_config", "//base", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//components/session_manager/core", "//device/bluetooth", "//mojo/public/cpp/bindings", @@ -173,9 +175,9 @@ source_set("unit_tests") { "//ash/services/nearby/public/cpp", "//base", "//base/test:test_support", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/cpp:unit_tests", "//chromeos/dbus/power", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/cpp:unit_tests", "//components/session_manager/core", "//components/sync_preferences:test_support", "//components/user_manager:test_support", diff --git a/chromeos/services/bluetooth_config/DEPS b/chromeos/ash/services/bluetooth_config/DEPS similarity index 76% rename from chromeos/services/bluetooth_config/DEPS rename to chromeos/ash/services/bluetooth_config/DEPS index 71891611fc2643..5eeb68f45fff41 100644 --- a/chromeos/services/bluetooth_config/DEPS +++ b/chromeos/ash/services/bluetooth_config/DEPS @@ -1,10 +1,7 @@ include_rules = [ "+ash/services/nearby/public/cpp/nearby_client_uuids.h", - "+ash/constants", - "+components/device_event_log", "+components/session_manager/core", "+components/sync_preferences/testing_pref_service_syncable.h", "+components/user_manager", "+device/bluetooth", - "+mojo/public", ] diff --git a/chromeos/services/bluetooth_config/DIR_METADATA b/chromeos/ash/services/bluetooth_config/DIR_METADATA similarity index 100% rename from chromeos/services/bluetooth_config/DIR_METADATA rename to chromeos/ash/services/bluetooth_config/DIR_METADATA diff --git a/chromeos/services/bluetooth_config/OWNERS b/chromeos/ash/services/bluetooth_config/OWNERS similarity index 100% rename from chromeos/services/bluetooth_config/OWNERS rename to chromeos/ash/services/bluetooth_config/OWNERS diff --git a/chromeos/services/bluetooth_config/adapter_state_controller.cc b/chromeos/ash/services/bluetooth_config/adapter_state_controller.cc similarity index 90% rename from chromeos/services/bluetooth_config/adapter_state_controller.cc rename to chromeos/ash/services/bluetooth_config/adapter_state_controller.cc index 328eeade0527a2..ae5d54cd7f07d4 100644 --- a/chromeos/services/bluetooth_config/adapter_state_controller.cc +++ b/chromeos/ash/services/bluetooth_config/adapter_state_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/adapter_state_controller.h b/chromeos/ash/services/bluetooth_config/adapter_state_controller.h similarity index 85% rename from chromeos/services/bluetooth_config/adapter_state_controller.h rename to chromeos/ash/services/bluetooth_config/adapter_state_controller.h index 039089e2c58289..1b18a90f4e6b35 100644 --- a/chromeos/services/bluetooth_config/adapter_state_controller.h +++ b/chromeos/ash/services/bluetooth_config/adapter_state_controller.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ #include "base/observer_list.h" #include "base/observer_list_types.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -58,4 +58,4 @@ class AdapterStateController { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_H_ diff --git a/chromeos/services/bluetooth_config/adapter_state_controller_impl.cc b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/adapter_state_controller_impl.cc rename to chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.cc index 3fea6b95758733..afa440129bcbce 100644 --- a/chromeos/services/bluetooth_config/adapter_state_controller_impl.cc +++ b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/adapter_state_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h" #include "base/bind.h" #include "components/device_event_log/device_event_log.h" diff --git a/chromeos/services/bluetooth_config/adapter_state_controller_impl.h b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h similarity index 86% rename from chromeos/services/bluetooth_config/adapter_state_controller_impl.h rename to chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h index a726d4350e6f59..d21c7d5a70668d 100644 --- a/chromeos/services/bluetooth_config/adapter_state_controller_impl.h +++ b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "device/bluetooth/bluetooth_adapter.h" namespace chromeos { @@ -71,4 +71,4 @@ class AdapterStateControllerImpl : public AdapterStateController, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_ADAPTER_STATE_CONTROLLER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/adapter_state_controller_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl_unittest.cc similarity index 99% rename from chromeos/services/bluetooth_config/adapter_state_controller_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/adapter_state_controller_impl_unittest.cc index c7ca7354c6ae11..b891659d4a08f2 100644 --- a/chromeos/services/bluetooth_config/adapter_state_controller_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/adapter_state_controller_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/adapter_state_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h" #include #include diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.cc similarity index 91% rename from chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc rename to chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.cc index 280e3b06562d42..8f5ce59e088f29 100644 --- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc +++ b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "components/device_event_log/device_event_log.h" namespace chromeos { diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h similarity index 84% rename from chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h rename to chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h index 4c779b66e90dbb..e7001bc0f6068e 100644 --- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h +++ b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote_set.h" @@ -56,4 +56,4 @@ class BluetoothDeviceStatusNotifier { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc similarity index 96% rename from chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc rename to chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc index 8605ace0cf4afd..426c90e4749ad1 100644 --- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc +++ b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" + +#include #include "ash/services/nearby/public/cpp/nearby_client_uuids.h" #include "base/ranges/algorithm.h" #include "base/time/time.h" -#include "chromeos/services/bluetooth_config/device_cache.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/public/cpp/bluetooth_uuid.h" -#include - namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h similarity index 88% rename from chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h rename to chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h index b1206dca6db966..3ecd867534fcac 100644 --- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h +++ b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ #include @@ -11,9 +11,9 @@ #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" #include "chromeos/dbus/power/power_manager_client.h" -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h" -#include "chromeos/services/bluetooth_config/device_cache.h" #include "device/bluetooth/bluetooth_adapter.h" namespace device { @@ -93,4 +93,4 @@ class BluetoothDeviceStatusNotifierImpl } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_DEVICE_STATUS_NOTIFIER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc similarity index 98% rename from chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc index 58bf1b2ba9699e..f4f4c0f74e6d06 100644 --- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" #include #include @@ -12,10 +12,10 @@ #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" #include "chromeos/dbus/power/fake_power_manager_client.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/chromeos/services/bluetooth_config/bluetooth_power_controller.h b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h similarity index 87% rename from chromeos/services/bluetooth_config/bluetooth_power_controller.h rename to chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h index e2a7593a5cccd1..6c87c3006d56c7 100644 --- a/chromeos/services/bluetooth_config/bluetooth_power_controller.h +++ b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ class PrefService; @@ -42,4 +42,4 @@ class BluetoothPowerController { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_H_ diff --git a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl.cc b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/bluetooth_power_controller_impl.cc rename to chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.cc index f7ffd57240f552..a5fcf67451dcec 100644 --- a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl.cc +++ b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "components/device_event_log/device_event_log.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h similarity index 87% rename from chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h rename to chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h index 20cc60789b7736..02c6cab3cbb71f 100644 --- a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h +++ b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ -#include "chromeos/services/bluetooth_config/bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" #include "components/user_manager/user_type.h" class PrefRegistrySimple; @@ -80,4 +80,4 @@ class BluetoothPowerControllerImpl : public BluetoothPowerController, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_BLUETOOTH_POWER_CONTROLLER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc similarity index 98% rename from chromeos/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc index a4b8b236eb58c0..5591794090c301 100644 --- a/chromeos/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" #include "components/session_manager/core/session_manager.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/user_manager/fake_user_manager.h" diff --git a/chromeos/services/bluetooth_config/cros_bluetooth_config.cc b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config.cc similarity index 87% rename from chromeos/services/bluetooth_config/cros_bluetooth_config.cc rename to chromeos/ash/services/bluetooth_config/cros_bluetooth_config.cc index 9a0c8a14002ded..10351e8aeff4e1 100644 --- a/chromeos/services/bluetooth_config/cros_bluetooth_config.cc +++ b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/cros_bluetooth_config.h" - -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" -#include "chromeos/services/bluetooth_config/bluetooth_power_controller.h" -#include "chromeos/services/bluetooth_config/device_name_manager.h" -#include "chromeos/services/bluetooth_config/device_operation_handler.h" -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/initializer.h" -#include "chromeos/services/bluetooth_config/system_properties_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h" + +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/initializer.h" +#include "chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/bluetooth_adapter.h" diff --git a/chromeos/services/bluetooth_config/cros_bluetooth_config.h b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h similarity index 91% rename from chromeos/services/bluetooth_config/cros_bluetooth_config.h rename to chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h index ea560755280115..932d527d0580b3 100644 --- a/chromeos/services/bluetooth_config/cros_bluetooth_config.h +++ b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ #include #include "base/memory/ref_counted.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h" @@ -91,4 +91,4 @@ class CrosBluetoothConfig : public mojom::CrosBluetoothConfig { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_CROS_BLUETOOTH_CONFIG_H_ diff --git a/chromeos/services/bluetooth_config/cros_bluetooth_config_unittest.cc b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config_unittest.cc similarity index 90% rename from chromeos/services/bluetooth_config/cros_bluetooth_config_unittest.cc rename to chromeos/ash/services/bluetooth_config/cros_bluetooth_config_unittest.cc index e87e057322172b..861f931f026802 100644 --- a/chromeos/services/bluetooth_config/cros_bluetooth_config_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/cros_bluetooth_config_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/cros_bluetooth_config.h" +#include "chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h" #include @@ -10,15 +10,15 @@ #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h" +#include "chromeos/ash/services/bluetooth_config/initializer_impl.h" #include "chromeos/dbus/power/fake_power_manager_client.h" -#include "chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h" -#include "chromeos/services/bluetooth_config/device_name_manager_impl.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" -#include "chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h" -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/fake_system_properties_observer.h" -#include "chromeos/services/bluetooth_config/initializer_impl.h" #include "components/session_manager/core/session_manager.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/user_manager/fake_user_manager.h" diff --git a/chromeos/services/bluetooth_config/device_cache.cc b/chromeos/ash/services/bluetooth_config/device_cache.cc similarity index 92% rename from chromeos/services/bluetooth_config/device_cache.cc rename to chromeos/ash/services/bluetooth_config/device_cache.cc index 6038f15348436d..993b84ed55417d 100644 --- a/chromeos/services/bluetooth_config/device_cache.cc +++ b/chromeos/ash/services/bluetooth_config/device_cache.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "components/device_event_log/device_event_log.h" namespace chromeos { diff --git a/chromeos/services/bluetooth_config/device_cache.h b/chromeos/ash/services/bluetooth_config/device_cache.h similarity index 90% rename from chromeos/services/bluetooth_config/device_cache.h rename to chromeos/ash/services/bluetooth_config/device_cache.h index 86144421015208..d7d78b6785e8eb 100644 --- a/chromeos/services/bluetooth_config/device_cache.h +++ b/chromeos/ash/services/bluetooth_config/device_cache.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ #include #include "base/observer_list.h" #include "base/observer_list_types.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -83,4 +83,4 @@ class DeviceCache { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_H_ diff --git a/chromeos/services/bluetooth_config/device_cache_impl.cc b/chromeos/ash/services/bluetooth_config/device_cache_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_cache_impl.cc rename to chromeos/ash/services/bluetooth_config/device_cache_impl.cc index 5eed62fd39e0af..415cd195af55f7 100644 --- a/chromeos/services/bluetooth_config/device_cache_impl.cc +++ b/chromeos/ash/services/bluetooth_config/device_cache_impl.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_cache_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_cache_impl.h" #include #include "base/containers/contains.h" -#include "chromeos/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/chromeos/bluetooth_utils.h" diff --git a/chromeos/services/bluetooth_config/device_cache_impl.h b/chromeos/ash/services/bluetooth_config/device_cache_impl.h similarity index 92% rename from chromeos/services/bluetooth_config/device_cache_impl.h rename to chromeos/ash/services/bluetooth_config/device_cache_impl.h index 3ae0254bbf51bc..d82cfe00880cd2 100644 --- a/chromeos/services/bluetooth_config/device_cache_impl.h +++ b/chromeos/ash/services/bluetooth_config/device_cache_impl.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ #include "base/memory/ref_counted.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_cache.h" -#include "chromeos/services/bluetooth_config/device_name_manager.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "device/bluetooth/bluetooth_adapter.h" namespace chromeos { @@ -160,4 +160,4 @@ class DeviceCacheImpl : public DeviceCache, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CACHE_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/device_cache_impl_unittest.cc similarity index 99% rename from chromeos/services/bluetooth_config/device_cache_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/device_cache_impl_unittest.cc index 9eb1b3d7d60d15..41087892bc42fe 100644 --- a/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/device_cache_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_cache_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_cache_impl.h" #include #include @@ -11,9 +11,9 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_name_manager.h" -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" #include "device/bluetooth/bluetooth_common.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" diff --git a/chromeos/services/bluetooth_config/device_conversion_util.cc b/chromeos/ash/services/bluetooth_config/device_conversion_util.cc similarity index 97% rename from chromeos/services/bluetooth_config/device_conversion_util.cc rename to chromeos/ash/services/bluetooth_config/device_conversion_util.cc index 7a4062ecc17829..a8dea1ef949b8d 100644 --- a/chromeos/services/bluetooth_config/device_conversion_util.cc +++ b/chromeos/ash/services/bluetooth_config/device_conversion_util.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" #include #include "base/strings/utf_string_conversions.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "device/bluetooth/bluetooth_common.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/public/cpp/bluetooth_uuid.h" diff --git a/chromeos/services/bluetooth_config/device_conversion_util.h b/chromeos/ash/services/bluetooth_config/device_conversion_util.h similarity index 67% rename from chromeos/services/bluetooth_config/device_conversion_util.h rename to chromeos/ash/services/bluetooth_config/device_conversion_util.h index 8af602c5f449b6..f4fc46cc6069cd 100644 --- a/chromeos/services/bluetooth_config/device_conversion_util.h +++ b/chromeos/ash/services/bluetooth_config/device_conversion_util.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace device { class BluetoothDevice; @@ -25,4 +25,4 @@ mojom::BluetoothDevicePropertiesPtr GenerateBluetoothDeviceMojoProperties( } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_CONVERSION_UTIL_H_ diff --git a/chromeos/services/bluetooth_config/device_conversion_util_unittest.cc b/chromeos/ash/services/bluetooth_config/device_conversion_util_unittest.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_conversion_util_unittest.cc rename to chromeos/ash/services/bluetooth_config/device_conversion_util_unittest.cc index c32ca5b3ee8a61..c77dbe58505c74 100644 --- a/chromeos/services/bluetooth_config/device_conversion_util_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/device_conversion_util_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" #include #include "base/strings/utf_string_conversions.h" -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chromeos/services/bluetooth_config/device_name_manager.cc b/chromeos/ash/services/bluetooth_config/device_name_manager.cc similarity index 91% rename from chromeos/services/bluetooth_config/device_name_manager.cc rename to chromeos/ash/services/bluetooth_config/device_name_manager.cc index f82509ae96fd14..15f0f07cc1fb00 100644 --- a/chromeos/services/bluetooth_config/device_name_manager.cc +++ b/chromeos/ash/services/bluetooth_config/device_name_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/device_name_manager.h b/chromeos/ash/services/bluetooth_config/device_name_manager.h similarity index 90% rename from chromeos/services/bluetooth_config/device_name_manager.h rename to chromeos/ash/services/bluetooth_config/device_name_manager.h index b9917a8d5b1b64..8bd9955abb409a 100644 --- a/chromeos/services/bluetooth_config/device_name_manager.h +++ b/chromeos/ash/services/bluetooth_config/device_name_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ #include @@ -66,4 +66,4 @@ class DeviceNameManager { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_H_ diff --git a/chromeos/services/bluetooth_config/device_name_manager_impl.cc b/chromeos/ash/services/bluetooth_config/device_name_manager_impl.cc similarity index 96% rename from chromeos/services/bluetooth_config/device_name_manager_impl.cc rename to chromeos/ash/services/bluetooth_config/device_name_manager_impl.cc index bc8deeda91904a..00d7421fec0c9a 100644 --- a/chromeos/services/bluetooth_config/device_name_manager_impl.cc +++ b/chromeos/ash/services/bluetooth_config/device_name_manager_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_name_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "components/device_event_log/device_event_log.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/chromeos/services/bluetooth_config/device_name_manager_impl.h b/chromeos/ash/services/bluetooth_config/device_name_manager_impl.h similarity index 82% rename from chromeos/services/bluetooth_config/device_name_manager_impl.h rename to chromeos/ash/services/bluetooth_config/device_name_manager_impl.h index 6a2d1e276a04c9..61c22b6071d1a0 100644 --- a/chromeos/services/bluetooth_config/device_name_manager_impl.h +++ b/chromeos/ash/services/bluetooth_config/device_name_manager_impl.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ -#include "chromeos/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" @@ -44,4 +44,4 @@ class DeviceNameManagerImpl : public DeviceNameManager { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_NAME_MANAGER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/device_name_manager_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/device_name_manager_impl_unittest.cc similarity index 99% rename from chromeos/services/bluetooth_config/device_name_manager_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/device_name_manager_impl_unittest.cc index 13848b5a412633..020029cacc12de 100644 --- a/chromeos/services/bluetooth_config/device_name_manager_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/device_name_manager_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_name_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" diff --git a/chromeos/services/bluetooth_config/device_operation_handler.cc b/chromeos/ash/services/bluetooth_config/device_operation_handler.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_operation_handler.cc rename to chromeos/ash/services/bluetooth_config/device_operation_handler.cc index 3f952da949936e..c75645480f0811 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler.cc +++ b/chromeos/ash/services/bluetooth_config/device_operation_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/bluetooth_common.h" diff --git a/chromeos/services/bluetooth_config/device_operation_handler.h b/chromeos/ash/services/bluetooth_config/device_operation_handler.h similarity index 93% rename from chromeos/services/bluetooth_config/device_operation_handler.h rename to chromeos/ash/services/bluetooth_config/device_operation_handler.h index 5a48ed34230e8b..24263130b00cdb 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler.h +++ b/chromeos/ash/services/bluetooth_config/device_operation_handler.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ #include "base/containers/queue.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" #include "device/bluetooth/bluetooth_common.h" #include "device/bluetooth/bluetooth_device.h" @@ -129,4 +129,4 @@ class DeviceOperationHandler : public AdapterStateController::Observer { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_H_ diff --git a/chromeos/services/bluetooth_config/device_operation_handler_impl.cc b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_operation_handler_impl.cc rename to chromeos/ash/services/bluetooth_config/device_operation_handler_impl.cc index bd0c36a3463ea7..0def5fbb24adf5 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler_impl.cc +++ b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_operation_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h" #include "base/time/time.h" #include "components/device_event_log/device_event_log.h" diff --git a/chromeos/services/bluetooth_config/device_operation_handler_impl.h b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h similarity index 78% rename from chromeos/services/bluetooth_config/device_operation_handler_impl.h rename to chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h index f998dfe3cede2a..326f7c8218b85a 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler_impl.h +++ b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ #include "base/memory/weak_ptr.h" #include "base/time/time.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_name_manager.h" -#include "chromeos/services/bluetooth_config/device_operation_handler.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" @@ -59,4 +59,4 @@ class DeviceOperationHandlerImpl : public DeviceOperationHandler { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/device_operation_handler_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl_unittest.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_operation_handler_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/device_operation_handler_impl_unittest.cc index 7a8367023f20b8..56c09423086986 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/device_operation_handler_impl_unittest.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_operation_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/clock.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_name_manager.h" -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" #include "device/bluetooth/chromeos/bluetooth_utils.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" diff --git a/chromeos/services/bluetooth_config/device_pairing_handler.cc b/chromeos/ash/services/bluetooth_config/device_pairing_handler.cc similarity index 99% rename from chromeos/services/bluetooth_config/device_pairing_handler.cc rename to chromeos/ash/services/bluetooth_config/device_pairing_handler.cc index 70da3a0f6390fc..bfc43d53ae47fb 100644 --- a/chromeos/services/bluetooth_config/device_pairing_handler.cc +++ b/chromeos/ash/services/bluetooth_config/device_pairing_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" diff --git a/chromeos/services/bluetooth_config/device_pairing_handler.h b/chromeos/ash/services/bluetooth_config/device_pairing_handler.h similarity index 90% rename from chromeos/services/bluetooth_config/device_pairing_handler.h rename to chromeos/ash/services/bluetooth_config/device_pairing_handler.h index a2e40bea2668f3..7aaafa5fd624dc 100644 --- a/chromeos/services/bluetooth_config/device_pairing_handler.h +++ b/chromeos/ash/services/bluetooth_config/device_pairing_handler.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "device/bluetooth/chromeos/bluetooth_utils.h" #include "mojo/public/cpp/bindings/remote.h" @@ -112,4 +112,4 @@ class DevicePairingHandler : public mojom::DevicePairingHandler, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_H_ diff --git a/chromeos/services/bluetooth_config/device_pairing_handler_impl.cc b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/device_pairing_handler_impl.cc rename to chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.cc index e2a988863f9137..6e412d8cd3e7eb 100644 --- a/chromeos/services/bluetooth_config/device_pairing_handler_impl.cc +++ b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_pairing_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h" -#include "chromeos/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" #include "components/device_event_log/device_event_log.h" namespace chromeos { diff --git a/chromeos/services/bluetooth_config/device_pairing_handler_impl.h b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h similarity index 89% rename from chromeos/services/bluetooth_config/device_pairing_handler_impl.h rename to chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h index 127ba12dd9ba68..cfa87d444abfe2 100644 --- a/chromeos/services/bluetooth_config/device_pairing_handler_impl.h +++ b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_pairing_handler.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" @@ -102,4 +102,4 @@ class DevicePairingHandlerImpl } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DEVICE_PAIRING_HANDLER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/device_pairing_handler_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl_unittest.cc similarity index 99% rename from chromeos/services/bluetooth_config/device_pairing_handler_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/device_pairing_handler_impl_unittest.cc index 9e8ea0b8e65301..1fb0ed0c1b289a 100644 --- a/chromeos/services/bluetooth_config/device_pairing_handler_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/device_pairing_handler_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/device_pairing_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" @@ -10,10 +10,10 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/clock.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_pairing_delegate.h" -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/fake_key_entered_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h" #include "device/bluetooth/chromeos/bluetooth_utils.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider.cc b/chromeos/ash/services/bluetooth_config/discovered_devices_provider.cc similarity index 90% rename from chromeos/services/bluetooth_config/discovered_devices_provider.cc rename to chromeos/ash/services/bluetooth_config/discovered_devices_provider.cc index a0b345a686fdce..f538dca03ce4df 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider.cc +++ b/chromeos/ash/services/bluetooth_config/discovered_devices_provider.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider.h b/chromeos/ash/services/bluetooth_config/discovered_devices_provider.h similarity index 79% rename from chromeos/services/bluetooth_config/discovered_devices_provider.h rename to chromeos/ash/services/bluetooth_config/discovered_devices_provider.h index 596ea9bfaceda6..d9e602dbb1e1a2 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider.h +++ b/chromeos/ash/services/bluetooth_config/discovered_devices_provider.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ #include #include "base/observer_list.h" #include "base/observer_list_types.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -48,4 +48,4 @@ class DiscoveredDevicesProvider { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_H_ diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.cc b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.cc similarity index 98% rename from chromeos/services/bluetooth_config/discovered_devices_provider_impl.cc rename to chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.cc index 4b387e310ff89d..d71b63c2fa4938 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.cc +++ b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovered_devices_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h" #include diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h similarity index 83% rename from chromeos/services/bluetooth_config/discovered_devices_provider_impl.h rename to chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h index 3245253c999802..2454b3218e2ca4 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h +++ b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "chromeos/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" namespace chromeos { namespace bluetooth_config { @@ -60,4 +60,4 @@ class DiscoveredDevicesProviderImpl : public DiscoveredDevicesProvider, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERED_DEVICES_PROVIDER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc similarity index 97% rename from chromeos/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc index 98dfb8990c8753..510bc521fe9399 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl_unittest.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovered_devices_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h" -#include "chromeos/services/bluetooth_config/device_conversion_util.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" #include "device/bluetooth/test/mock_bluetooth_device.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromeos/services/bluetooth_config/discovery_session_manager.cc b/chromeos/ash/services/bluetooth_config/discovery_session_manager.cc similarity index 98% rename from chromeos/services/bluetooth_config/discovery_session_manager.cc rename to chromeos/ash/services/bluetooth_config/discovery_session_manager.cc index c061fe5a5c1ccc..ffb672f5149f5b 100644 --- a/chromeos/services/bluetooth_config/discovery_session_manager.cc +++ b/chromeos/ash/services/bluetooth_config/discovery_session_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager.h" #include "components/device_event_log/device_event_log.h" #include "base/bind.h" diff --git a/chromeos/services/bluetooth_config/discovery_session_manager.h b/chromeos/ash/services/bluetooth_config/discovery_session_manager.h similarity index 86% rename from chromeos/services/bluetooth_config/discovery_session_manager.h rename to chromeos/ash/services/bluetooth_config/discovery_session_manager.h index 6290d1eb83b3b5..b6e3b1749614d4 100644 --- a/chromeos/services/bluetooth_config/discovery_session_manager.h +++ b/chromeos/ash/services/bluetooth_config/discovery_session_manager.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_pairing_handler.h" -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/discovery_session_status_notifier.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote_set.h" @@ -108,4 +108,4 @@ class DiscoverySessionManager : public AdapterStateController::Observer, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_H_ diff --git a/chromeos/services/bluetooth_config/discovery_session_manager_impl.cc b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.cc similarity index 96% rename from chromeos/services/bluetooth_config/discovery_session_manager_impl.cc rename to chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.cc index ccfd597c7a3b66..4a9324ddca08b0 100644 --- a/chromeos/services/bluetooth_config/discovery_session_manager_impl.cc +++ b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovery_session_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h" #include "base/feature_list.h" -#include "chromeos/services/bluetooth_config/device_pairing_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/bluetooth_discovery_session.h" #include "device/bluetooth/floss/floss_features.h" diff --git a/chromeos/services/bluetooth_config/discovery_session_manager_impl.h b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h similarity index 78% rename from chromeos/services/bluetooth_config/discovery_session_manager_impl.h rename to chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h index 29209a7669f228..78957da11bb33c 100644 --- a/chromeos/services/bluetooth_config/discovery_session_manager_impl.h +++ b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ #include #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_pairing_handler.h" -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "device/bluetooth/bluetooth_adapter.h" namespace device { @@ -73,4 +73,4 @@ class DiscoverySessionManagerImpl : public DiscoverySessionManager, } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_MANAGER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/discovery_session_manager_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl_unittest.cc similarity index 97% rename from chromeos/services/bluetooth_config/discovery_session_manager_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/discovery_session_manager_impl_unittest.cc index c79afebed54a0a..593c102a53d190 100644 --- a/chromeos/services/bluetooth_config/discovery_session_manager_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/discovery_session_manager_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovery_session_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h" #include @@ -13,14 +13,14 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/types/token_type.h" -#include "chromeos/services/bluetooth_config/device_conversion_util.h" -#include "chromeos/services/bluetooth_config/device_pairing_handler_impl.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" -#include "chromeos/services/bluetooth_config/fake_device_pairing_delegate.h" -#include "chromeos/services/bluetooth_config/fake_device_pairing_handler.h" -#include "chromeos/services/bluetooth_config/fake_discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h" #include "device/bluetooth/floss/floss_features.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" diff --git a/chromeos/services/bluetooth_config/discovery_session_status_notifier.cc b/chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.cc similarity index 86% rename from chromeos/services/bluetooth_config/discovery_session_status_notifier.cc rename to chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.cc index 86e122d100d49d..46c3d93964c89a 100644 --- a/chromeos/services/bluetooth_config/discovery_session_status_notifier.cc +++ b/chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/discovery_session_status_notifier.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "components/device_event_log/device_event_log.h" namespace chromeos { diff --git a/chromeos/services/bluetooth_config/discovery_session_status_notifier.h b/chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.h similarity index 78% rename from chromeos/services/bluetooth_config/discovery_session_status_notifier.h rename to chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.h index 575943dbfd4c11..46dbdf1b4dbb63 100644 --- a/chromeos/services/bluetooth_config/discovery_session_status_notifier.h +++ b/chromeos/ash/services/bluetooth_config/discovery_session_status_notifier.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote_set.h" @@ -39,4 +39,4 @@ class DiscoverySessionStatusNotifier { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_DISCOVERY_SESSION_STATUS_NOTIFIER_H_ diff --git a/chromeos/services/bluetooth_config/fake_adapter_state_controller.cc b/chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.cc similarity index 87% rename from chromeos/services/bluetooth_config/fake_adapter_state_controller.cc rename to chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.cc index 4eceb091158629..59eef85f43515b 100644 --- a/chromeos/services/bluetooth_config/fake_adapter_state_controller.cc +++ b/chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" #include "base/run_loop.h" -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_adapter_state_controller.h b/chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h similarity index 66% rename from chromeos/services/bluetooth_config/fake_adapter_state_controller.h rename to chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h index 70206922b50f83..1870f842489dce 100644 --- a/chromeos/services/bluetooth_config/fake_adapter_state_controller.h +++ b/chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -33,4 +33,4 @@ class FakeAdapterStateController : public AdapterStateController { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_ADAPTER_STATE_CONTROLLER_H_ diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc similarity index 91% rename from chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc index 3a17a5d1ee884c..daba0480695060 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h similarity index 64% rename from chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h index 83f9ba4abd4412..56a70194ae0a4e 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -30,4 +30,4 @@ class FakeBluetoothDeviceStatusNotifier : public BluetoothDeviceStatusNotifier { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ \ No newline at end of file +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_NOTIFIER_H_ \ No newline at end of file diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.cc b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.cc similarity index 93% rename from chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.cc rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.cc index 6eaba52fa3f063..e8231b464adf07 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.cc +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h" #include diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h similarity index 85% rename from chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h index 81ace9c0f1dad3..8b60d77946ab87 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_observer.h +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_observer.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ #include #include "base/run_loop.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -66,4 +66,4 @@ class FakeBluetoothDeviceStatusObserver } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DEVICE_STATUS_OBSERVER_H_ diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc b/chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc similarity index 95% rename from chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc index 8960f7125ec248..d0e7a1a60c3e84 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h" #include "base/bind.h" #include "base/run_loop.h" diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h b/chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h similarity index 85% rename from chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h index 785c256c9bb8d5..46c043acf5a87b 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_discovery_delegate.h +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_discovery_delegate.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" @@ -64,4 +64,4 @@ class FakeBluetoothDiscoveryDelegate } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_DISCOVERY_DELEGATE_H_ diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_power_controller.cc b/chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.cc similarity index 93% rename from chromeos/services/bluetooth_config/fake_bluetooth_power_controller.cc rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.cc index c5c58121612028..4b7a291eea915b 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_power_controller.cc +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h b/chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h similarity index 72% rename from chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h rename to chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h index 0d8e3d7a0881ec..750392ec0034fd 100644 --- a/chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h +++ b/chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller.h" namespace chromeos { namespace bluetooth_config { @@ -37,4 +37,4 @@ class FakeBluetoothPowerController : public BluetoothPowerController { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_BLUETOOTH_POWER_CONTROLLER_H_ diff --git a/chromeos/services/bluetooth_config/fake_device_cache.cc b/chromeos/ash/services/bluetooth_config/fake_device_cache.cc similarity index 95% rename from chromeos/services/bluetooth_config/fake_device_cache.cc rename to chromeos/ash/services/bluetooth_config/fake_device_cache.cc index 711392a2dac9db..677f626604e2c8 100644 --- a/chromeos/services/bluetooth_config/fake_device_cache.cc +++ b/chromeos/ash/services/bluetooth_config/fake_device_cache.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_device_cache.h b/chromeos/ash/services/bluetooth_config/fake_device_cache.h similarity index 79% rename from chromeos/services/bluetooth_config/fake_device_cache.h rename to chromeos/ash/services/bluetooth_config/fake_device_cache.h index 8df76dd96799a9..7c727402950cf7 100644 --- a/chromeos/services/bluetooth_config/fake_device_cache.h +++ b/chromeos/ash/services/bluetooth_config/fake_device_cache.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ -#include "chromeos/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" namespace chromeos { namespace bluetooth_config { @@ -37,4 +37,4 @@ class FakeDeviceCache : public DeviceCache { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_CACHE_H_ diff --git a/chromeos/services/bluetooth_config/fake_device_name_manager.cc b/chromeos/ash/services/bluetooth_config/fake_device_name_manager.cc similarity index 93% rename from chromeos/services/bluetooth_config/fake_device_name_manager.cc rename to chromeos/ash/services/bluetooth_config/fake_device_name_manager.cc index 2d04de27ac155c..9cb2a4e25a84d7 100644 --- a/chromeos/services/bluetooth_config/fake_device_name_manager.cc +++ b/chromeos/ash/services/bluetooth_config/fake_device_name_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_name_manager.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_device_name_manager.h b/chromeos/ash/services/bluetooth_config/fake_device_name_manager.h similarity index 75% rename from chromeos/services/bluetooth_config/fake_device_name_manager.h rename to chromeos/ash/services/bluetooth_config/fake_device_name_manager.h index 7dcfee5f91a376..10cd3c348cff56 100644 --- a/chromeos/services/bluetooth_config/fake_device_name_manager.h +++ b/chromeos/ash/services/bluetooth_config/fake_device_name_manager.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ -#include "chromeos/services/bluetooth_config/device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager.h" #include "base/containers/flat_map.h" @@ -34,4 +34,4 @@ class FakeDeviceNameManager : public DeviceNameManager { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_NAME_MANAGER_H_ diff --git a/chromeos/services/bluetooth_config/fake_device_operation_handler.cc b/chromeos/ash/services/bluetooth_config/fake_device_operation_handler.cc similarity index 93% rename from chromeos/services/bluetooth_config/fake_device_operation_handler.cc rename to chromeos/ash/services/bluetooth_config/fake_device_operation_handler.cc index d1c51f0373e3c3..1e0c22d9e96986 100644 --- a/chromeos/services/bluetooth_config/fake_device_operation_handler.cc +++ b/chromeos/ash/services/bluetooth_config/fake_device_operation_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_device_operation_handler.h b/chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h similarity index 79% rename from chromeos/services/bluetooth_config/fake_device_operation_handler.h rename to chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h index ee0c81adb630ad..fd1a55fd6e592b 100644 --- a/chromeos/services/bluetooth_config/fake_device_operation_handler.h +++ b/chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ #include #include -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler.h" namespace chromeos { namespace bluetooth_config { @@ -51,4 +51,4 @@ class FakeDeviceOperationHandler : public DeviceOperationHandler { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_OPERATION_HANDLER_H_ diff --git a/chromeos/services/bluetooth_config/fake_device_pairing_delegate.cc b/chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.cc similarity index 97% rename from chromeos/services/bluetooth_config/fake_device_pairing_delegate.cc rename to chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.cc index 4b5a7fe898d478..755f9e4b341842 100644 --- a/chromeos/services/bluetooth_config/fake_device_pairing_delegate.cc +++ b/chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_device_pairing_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h" #include "base/bind.h" #include "base/run_loop.h" diff --git a/chromeos/services/bluetooth_config/fake_device_pairing_delegate.h b/chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h similarity index 87% rename from chromeos/services/bluetooth_config/fake_device_pairing_delegate.h rename to chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h index cc8ecf52cdbb67..792120bd194768 100644 --- a/chromeos/services/bluetooth_config/fake_device_pairing_delegate.h +++ b/chromeos/ash/services/bluetooth_config/fake_device_pairing_delegate.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ -#include "chromeos/services/bluetooth_config/fake_key_entered_handler.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -79,4 +79,4 @@ class FakeDevicePairingDelegate : public mojom::DevicePairingDelegate { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_DELEGATE_H_ diff --git a/chromeos/services/bluetooth_config/fake_device_pairing_handler.cc b/chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.cc similarity index 95% rename from chromeos/services/bluetooth_config/fake_device_pairing_handler.cc rename to chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.cc index dfb0751c71e978..86b3b63b71850f 100644 --- a/chromeos/services/bluetooth_config/fake_device_pairing_handler.cc +++ b/chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h" #include "base/run_loop.h" -#include "chromeos/services/bluetooth_config/device_conversion_util.h" +#include "chromeos/ash/services/bluetooth_config/device_conversion_util.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_device_pairing_handler.h b/chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h similarity index 86% rename from chromeos/services/bluetooth_config/fake_device_pairing_handler.h rename to chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h index e5b6e16148d9c9..7bfb9fd061e410 100644 --- a/chromeos/services/bluetooth_config/fake_device_pairing_handler.h +++ b/chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ -#include "chromeos/services/bluetooth_config/device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/device_pairing_handler.h" namespace chromeos { namespace bluetooth_config { @@ -60,4 +60,4 @@ class FakeDevicePairingHandler : public DevicePairingHandler { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DEVICE_PAIRING_HANDLER_H_ diff --git a/chromeos/services/bluetooth_config/fake_discovered_devices_provider.cc b/chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.cc similarity index 92% rename from chromeos/services/bluetooth_config/fake_discovered_devices_provider.cc rename to chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.cc index ac2ae3c26a673e..7f115368eb3b3f 100644 --- a/chromeos/services/bluetooth_config/fake_discovered_devices_provider.cc +++ b/chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_discovered_devices_provider.h b/chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h similarity index 69% rename from chromeos/services/bluetooth_config/fake_discovered_devices_provider.h rename to chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h index 67b7d67de5be4b..919dd6736355ad 100644 --- a/chromeos/services/bluetooth_config/fake_discovered_devices_provider.h +++ b/chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" namespace chromeos { namespace bluetooth_config { @@ -29,4 +29,4 @@ class FakeDiscoveredDevicesProvider : public DiscoveredDevicesProvider { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERED_DEVICES_PROVIDER_H_ diff --git a/chromeos/services/bluetooth_config/fake_discovery_session_manager.cc b/chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.cc similarity index 96% rename from chromeos/services/bluetooth_config/fake_discovery_session_manager.cc rename to chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.cc index 1421151eb05fd6..7310688fbffe5c 100644 --- a/chromeos/services/bluetooth_config/fake_discovery_session_manager.cc +++ b/chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_discovery_session_manager.h b/chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h similarity index 73% rename from chromeos/services/bluetooth_config/fake_discovery_session_manager.h rename to chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h index f242a4211e8abb..a587ccc9a62c45 100644 --- a/chromeos/services/bluetooth_config/fake_discovery_session_manager.h +++ b/chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ -#include "chromeos/services/bluetooth_config/discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/fake_device_pairing_handler.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h" namespace chromeos { namespace bluetooth_config { @@ -45,4 +45,4 @@ class FakeDiscoverySessionManager : public DiscoverySessionManager { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_MANAGER_H_ diff --git a/chromeos/services/bluetooth_config/fake_discovery_session_status_observer.cc b/chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.cc similarity index 92% rename from chromeos/services/bluetooth_config/fake_discovery_session_status_observer.cc rename to chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.cc index bd4974dbd36d33..19e632854e601b 100644 --- a/chromeos/services/bluetooth_config/fake_discovery_session_status_observer.cc +++ b/chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h" #include diff --git a/chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h b/chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h similarity index 80% rename from chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h rename to chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h index eb95ba58307724..7aaeb9636480f8 100644 --- a/chromeos/services/bluetooth_config/fake_discovery_session_status_observer.h +++ b/chromeos/ash/services/bluetooth_config/fake_discovery_session_status_observer.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ #include "base/run_loop.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -49,4 +49,4 @@ class FakeDiscoverySessionStatusObserver } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_DISCOVERY_SESSION_STATUS_OBSERVER_H_ diff --git a/chromeos/services/bluetooth_config/fake_fast_pair_delegate.cc b/chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.cc similarity index 94% rename from chromeos/services/bluetooth_config/fake_fast_pair_delegate.cc rename to chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.cc index 96e907c60d41c9..d054a911eb2925 100644 --- a/chromeos/services/bluetooth_config/fake_fast_pair_delegate.cc +++ b/chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/fake_fast_pair_delegate.h b/chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h similarity index 81% rename from chromeos/services/bluetooth_config/fake_fast_pair_delegate.h rename to chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h index 08df1e90c54e2d..28c5ff260893ec 100644 --- a/chromeos/services/bluetooth_config/fake_fast_pair_delegate.h +++ b/chromeos/ash/services/bluetooth_config/fake_fast_pair_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ #include -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" namespace chromeos { namespace bluetooth_config { @@ -53,4 +53,4 @@ class FakeFastPairDelegate : public FastPairDelegate { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_FAST_PAIR_DELEGATE_H_ diff --git a/chromeos/services/bluetooth_config/fake_key_entered_handler.cc b/chromeos/ash/services/bluetooth_config/fake_key_entered_handler.cc similarity index 93% rename from chromeos/services/bluetooth_config/fake_key_entered_handler.cc rename to chromeos/ash/services/bluetooth_config/fake_key_entered_handler.cc index 9e38475e551b36..b4bec8fe200e4f 100644 --- a/chromeos/services/bluetooth_config/fake_key_entered_handler.cc +++ b/chromeos/ash/services/bluetooth_config/fake_key_entered_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_key_entered_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h" #include "base/bind.h" #include "base/run_loop.h" diff --git a/chromeos/services/bluetooth_config/fake_key_entered_handler.h b/chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h similarity index 73% rename from chromeos/services/bluetooth_config/fake_key_entered_handler.h rename to chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h index b30739a269569a..7f912369ca6d96 100644 --- a/chromeos/services/bluetooth_config/fake_key_entered_handler.h +++ b/chromeos/ash/services/bluetooth_config/fake_key_entered_handler.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/receiver.h" namespace chromeos { @@ -37,4 +37,4 @@ class FakeKeyEnteredHandler : public mojom::KeyEnteredHandler { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_KEY_ENTERED_HANDLER_H_ diff --git a/chromeos/services/bluetooth_config/fake_system_properties_observer.cc b/chromeos/ash/services/bluetooth_config/fake_system_properties_observer.cc similarity index 91% rename from chromeos/services/bluetooth_config/fake_system_properties_observer.cc rename to chromeos/ash/services/bluetooth_config/fake_system_properties_observer.cc index c3358b2ee25984..73787640513a4b 100644 --- a/chromeos/services/bluetooth_config/fake_system_properties_observer.cc +++ b/chromeos/ash/services/bluetooth_config/fake_system_properties_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/fake_system_properties_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h" #include diff --git a/chromeos/services/bluetooth_config/fake_system_properties_observer.h b/chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h similarity index 79% rename from chromeos/services/bluetooth_config/fake_system_properties_observer.h rename to chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h index a5dff84070859e..7a55fe93ba828d 100644 --- a/chromeos/services/bluetooth_config/fake_system_properties_observer.h +++ b/chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ #include #include "base/run_loop.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -45,4 +45,4 @@ class FakeSystemPropertiesObserver : public mojom::SystemPropertiesObserver { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAKE_SYSTEM_PROPERTIES_OBSERVER_H_ diff --git a/chromeos/services/bluetooth_config/fast_pair_delegate.h b/chromeos/ash/services/bluetooth_config/fast_pair_delegate.h similarity index 82% rename from chromeos/services/bluetooth_config/fast_pair_delegate.h rename to chromeos/ash/services/bluetooth_config/fast_pair_delegate.h index ae69b492213b79..826a86e078d1fd 100644 --- a/chromeos/services/bluetooth_config/fast_pair_delegate.h +++ b/chromeos/ash/services/bluetooth_config/fast_pair_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ #include "third_party/abseil-cpp/absl/types/optional.h" @@ -32,4 +32,4 @@ class FastPairDelegate { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_FAST_PAIR_DELEGATE_H_ diff --git a/chromeos/services/bluetooth_config/in_process_instance.cc b/chromeos/ash/services/bluetooth_config/in_process_instance.cc similarity index 93% rename from chromeos/services/bluetooth_config/in_process_instance.cc rename to chromeos/ash/services/bluetooth_config/in_process_instance.cc index ff041084da42f0..ee2e07a6ff97ae 100644 --- a/chromeos/services/bluetooth_config/in_process_instance.cc +++ b/chromeos/ash/services/bluetooth_config/in_process_instance.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/in_process_instance.h" +#include "chromeos/ash/services/bluetooth_config/in_process_instance.h" #include "ash/constants/ash_features.h" #include "base/bind.h" #include "base/check.h" -#include "chromeos/services/bluetooth_config/cros_bluetooth_config.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" -#include "chromeos/services/bluetooth_config/initializer_impl.h" +#include "chromeos/ash/services/bluetooth_config/cros_bluetooth_config.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" +#include "chromeos/ash/services/bluetooth_config/initializer_impl.h" #include "components/device_event_log/device_event_log.h" #include "device/bluetooth/bluetooth_adapter_factory.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chromeos/services/bluetooth_config/in_process_instance.h b/chromeos/ash/services/bluetooth_config/in_process_instance.h similarity index 81% rename from chromeos/services/bluetooth_config/in_process_instance.h rename to chromeos/ash/services/bluetooth_config/in_process_instance.h index 36d960989e875a..0d8ee7be17f759 100644 --- a/chromeos/services/bluetooth_config/in_process_instance.h +++ b/chromeos/ash/services/bluetooth_config/in_process_instance.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ #include "base/component_export.h" -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" class PrefService; @@ -42,4 +42,4 @@ void OverrideInProcessInstanceForTesting( } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_IN_PROCESS_INSTANCE_H_ diff --git a/chromeos/services/bluetooth_config/initializer.h b/chromeos/ash/services/bluetooth_config/initializer.h similarity index 93% rename from chromeos/services/bluetooth_config/initializer.h rename to chromeos/ash/services/bluetooth_config/initializer.h index 8b55f0c6559d81..e0f67c4aadffa5 100644 --- a/chromeos/services/bluetooth_config/initializer.h +++ b/chromeos/ash/services/bluetooth_config/initializer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ #include @@ -71,4 +71,4 @@ class Initializer { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_H_ diff --git a/chromeos/services/bluetooth_config/initializer_impl.cc b/chromeos/ash/services/bluetooth_config/initializer_impl.cc similarity index 79% rename from chromeos/services/bluetooth_config/initializer_impl.cc rename to chromeos/ash/services/bluetooth_config/initializer_impl.cc index 645167604425a2..156bea809e3a96 100644 --- a/chromeos/services/bluetooth_config/initializer_impl.cc +++ b/chromeos/ash/services/bluetooth_config/initializer_impl.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/initializer_impl.h" +#include "chromeos/ash/services/bluetooth_config/initializer_impl.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" +#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_cache_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/device_operation_handler_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovered_devices_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/discovery_session_manager_impl.h" +#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h" #include "chromeos/dbus/power/power_manager_client.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller_impl.h" -#include "chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.h" -#include "chromeos/services/bluetooth_config/bluetooth_power_controller_impl.h" -#include "chromeos/services/bluetooth_config/device_cache_impl.h" -#include "chromeos/services/bluetooth_config/device_name_manager_impl.h" -#include "chromeos/services/bluetooth_config/device_operation_handler_impl.h" -#include "chromeos/services/bluetooth_config/discovered_devices_provider_impl.h" -#include "chromeos/services/bluetooth_config/discovery_session_manager_impl.h" -#include "chromeos/services/bluetooth_config/fast_pair_delegate.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/initializer_impl.h b/chromeos/ash/services/bluetooth_config/initializer_impl.h similarity index 89% rename from chromeos/services/bluetooth_config/initializer_impl.h rename to chromeos/ash/services/bluetooth_config/initializer_impl.h index 5f3313cd16175b..c48615aa6e708b 100644 --- a/chromeos/services/bluetooth_config/initializer_impl.h +++ b/chromeos/ash/services/bluetooth_config/initializer_impl.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ -#include "chromeos/services/bluetooth_config/initializer.h" +#include "chromeos/ash/services/bluetooth_config/initializer.h" namespace chromeos { namespace bluetooth_config { @@ -52,4 +52,4 @@ class InitializerImpl : public Initializer { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_INITIALIZER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/public/cpp/BUILD.gn b/chromeos/ash/services/bluetooth_config/public/cpp/BUILD.gn similarity index 75% rename from chromeos/services/bluetooth_config/public/cpp/BUILD.gn rename to chromeos/ash/services/bluetooth_config/public/cpp/BUILD.gn index 043888c05b2bb9..8880f0d27c49bb 100644 --- a/chromeos/services/bluetooth_config/public/cpp/BUILD.gn +++ b/chromeos/ash/services/bluetooth_config/public/cpp/BUILD.gn @@ -2,7 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") +import("//build/config/chromeos/ui_mode.gni") + +assert(is_chromeos_ash) source_set("cpp") { sources = [ @@ -14,7 +16,7 @@ source_set("cpp") { deps = [ "//base", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", ] } @@ -30,7 +32,7 @@ source_set("unit_tests") { ":cpp", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", "//testing/gtest", ] } diff --git a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc similarity index 90% rename from chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc rename to chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc index 3ff76bea0a17ba..99575ec26a7fae 100644 --- a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc +++ b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h similarity index 66% rename from chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h rename to chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h index 1032c20355d635..1786e9283ae1e5 100644 --- a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h +++ b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ #include -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" namespace chromeos { namespace bluetooth_config { @@ -25,4 +25,4 @@ std::u16string GetPairedDeviceName( } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_CROS_BLUETOOTH_CONFIG_UTIL_H_ diff --git a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc similarity index 93% rename from chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc rename to chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc index 6b18d23cc3bcce..9d6a242b927705 100644 --- a/chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromeos/services/bluetooth_config/public/cpp/device_image_info.cc b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.cc similarity index 96% rename from chromeos/services/bluetooth_config/public/cpp/device_image_info.cc rename to chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.cc index d33376950aad9f..455d97277f94cf 100644 --- a/chromeos/services/bluetooth_config/public/cpp/device_image_info.cc +++ b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "base/values.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chromeos/services/bluetooth_config/public/cpp/device_image_info.h b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h similarity index 88% rename from chromeos/services/bluetooth_config/public/cpp/device_image_info.h rename to chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h index 694484a709fa2d..f9b77893fc9c5d 100644 --- a/chromeos/services/bluetooth_config/public/cpp/device_image_info.h +++ b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ #include @@ -59,4 +59,4 @@ class DeviceImageInfo { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ \ No newline at end of file +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_PUBLIC_CPP_DEVICE_IMAGE_INFO_H_ \ No newline at end of file diff --git a/chromeos/services/bluetooth_config/public/cpp/device_image_info_unittest.cc b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info_unittest.cc similarity index 96% rename from chromeos/services/bluetooth_config/public/cpp/device_image_info_unittest.cc rename to chromeos/ash/services/bluetooth_config/public/cpp/device_image_info_unittest.cc index 443fe9ac205dbc..777e9f14a2edd6 100644 --- a/chromeos/services/bluetooth_config/public/cpp/device_image_info_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/public/cpp/device_image_info_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h" +#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromeos/services/bluetooth_config/public/mojom/BUILD.gn b/chromeos/ash/services/bluetooth_config/public/mojom/BUILD.gn similarity index 68% rename from chromeos/services/bluetooth_config/public/mojom/BUILD.gn rename to chromeos/ash/services/bluetooth_config/public/mojom/BUILD.gn index a7fe24f5392abb..4dec3150f3579b 100644 --- a/chromeos/services/bluetooth_config/public/mojom/BUILD.gn +++ b/chromeos/ash/services/bluetooth_config/public/mojom/BUILD.gn @@ -2,14 +2,16 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/chromeos/ui_mode.gni") import("//mojo/public/tools/bindings/mojom.gni") +assert(is_chromeos_ash) + mojom("mojom") { sources = [ "cros_bluetooth_config.mojom" ] public_deps = [ "//mojo/public/mojom/base", "//url/mojom:url_mojom_gurl", ] - webui_module_path = - "chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom" + webui_module_path = "chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom" } diff --git a/chromeos/services/bluetooth_config/public/mojom/OWNERS b/chromeos/ash/services/bluetooth_config/public/mojom/OWNERS similarity index 100% rename from chromeos/services/bluetooth_config/public/mojom/OWNERS rename to chromeos/ash/services/bluetooth_config/public/mojom/OWNERS diff --git a/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom b/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom similarity index 100% rename from chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom rename to chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom diff --git a/chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc similarity index 84% rename from chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc rename to chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc index 1289442d58cb3d..2998b46d5e35ff 100644 --- a/chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc +++ b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" +#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" -#include "chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" -#include "chromeos/services/bluetooth_config/fake_device_name_manager.h" -#include "chromeos/services/bluetooth_config/fake_device_operation_handler.h" -#include "chromeos/services/bluetooth_config/fake_discovered_devices_provider.h" -#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h" -#include "chromeos/services/bluetooth_config/in_process_instance.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_device_status_notifier.h" +#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_name_manager.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h" +#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h" +#include "chromeos/ash/services/bluetooth_config/in_process_instance.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/dbus/bluez_dbus_manager.h" diff --git a/chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h similarity index 92% rename from chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h rename to chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h index 02e09d7d5ae1a3..bf453750950cba 100644 --- a/chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h +++ b/chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ -#include "chromeos/services/bluetooth_config/initializer.h" +#include "chromeos/ash/services/bluetooth_config/initializer.h" #include "components/session_manager/core/session_manager.h" @@ -111,4 +111,4 @@ class ScopedBluetoothConfigTestHelper : public Initializer { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SCOPED_BLUETOOTH_CONFIG_TEST_HELPER_H_ diff --git a/chromeos/services/bluetooth_config/system_properties_provider.cc b/chromeos/ash/services/bluetooth_config/system_properties_provider.cc similarity index 95% rename from chromeos/services/bluetooth_config/system_properties_provider.cc rename to chromeos/ash/services/bluetooth_config/system_properties_provider.cc index 0683480a1ace1d..b7a07049d1202e 100644 --- a/chromeos/services/bluetooth_config/system_properties_provider.cc +++ b/chromeos/ash/services/bluetooth_config/system_properties_provider.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/system_properties_provider.h" +#include "chromeos/ash/services/bluetooth_config/system_properties_provider.h" namespace chromeos { namespace bluetooth_config { diff --git a/chromeos/services/bluetooth_config/system_properties_provider.h b/chromeos/ash/services/bluetooth_config/system_properties_provider.h similarity index 85% rename from chromeos/services/bluetooth_config/system_properties_provider.h rename to chromeos/ash/services/bluetooth_config/system_properties_provider.h index 25e196daa6d533..dbc1e1f220301d 100644 --- a/chromeos/services/bluetooth_config/system_properties_provider.h +++ b/chromeos/ash/services/bluetooth_config/system_properties_provider.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ -#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" +#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote_set.h" @@ -55,4 +55,4 @@ class SystemPropertiesProvider { } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_H_ diff --git a/chromeos/services/bluetooth_config/system_properties_provider_impl.cc b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl.cc similarity index 97% rename from chromeos/services/bluetooth_config/system_properties_provider_impl.cc rename to chromeos/ash/services/bluetooth_config/system_properties_provider_impl.cc index 6a551166088087..c560e0c0b152f1 100644 --- a/chromeos/services/bluetooth_config/system_properties_provider_impl.cc +++ b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/system_properties_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h" #include "components/session_manager/core/session_manager.h" #include "components/user_manager/user_manager.h" diff --git a/chromeos/services/bluetooth_config/system_properties_provider_impl.h b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h similarity index 79% rename from chromeos/services/bluetooth_config/system_properties_provider_impl.h rename to chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h index 0181b6d383f450..e323c09a77ca76 100644 --- a/chromeos/services/bluetooth_config/system_properties_provider_impl.h +++ b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ -#define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ +#ifndef CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ +#define CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ #include "base/scoped_observation.h" -#include "chromeos/services/bluetooth_config/adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/device_cache.h" -#include "chromeos/services/bluetooth_config/system_properties_provider.h" +#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/device_cache.h" +#include "chromeos/ash/services/bluetooth_config/system_properties_provider.h" #include "components/session_manager/core/session_manager_observer.h" namespace chromeos { @@ -57,4 +57,4 @@ class SystemPropertiesProviderImpl } // namespace bluetooth_config } // namespace chromeos -#endif // CHROMEOS_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ +#endif // CHROMEOS_ASH_SERVICES_BLUETOOTH_CONFIG_SYSTEM_PROPERTIES_PROVIDER_IMPL_H_ diff --git a/chromeos/services/bluetooth_config/system_properties_provider_impl_unittest.cc b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl_unittest.cc similarity index 96% rename from chromeos/services/bluetooth_config/system_properties_provider_impl_unittest.cc rename to chromeos/ash/services/bluetooth_config/system_properties_provider_impl_unittest.cc index d459a8f7217580..1fdd4d878f9335 100644 --- a/chromeos/services/bluetooth_config/system_properties_provider_impl_unittest.cc +++ b/chromeos/ash/services/bluetooth_config/system_properties_provider_impl_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/services/bluetooth_config/system_properties_provider_impl.h" +#include "chromeos/ash/services/bluetooth_config/system_properties_provider_impl.h" #include #include "base/run_loop.h" #include "base/test/task_environment.h" -#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h" -#include "chromeos/services/bluetooth_config/fake_device_cache.h" -#include "chromeos/services/bluetooth_config/fake_system_properties_observer.h" +#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h" +#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h" +#include "chromeos/ash/services/bluetooth_config/fake_system_properties_observer.h" #include "components/session_manager/core/session_manager.h" #include "components/user_manager/fake_user_manager.h" #include "components/user_manager/scoped_user_manager.h" diff --git a/chromeos/resources/BUILD.gn b/chromeos/resources/BUILD.gn index b710de9f78b322..0cd3e1e65cd77e 100644 --- a/chromeos/resources/BUILD.gn +++ b/chromeos/resources/BUILD.gn @@ -23,8 +23,6 @@ grit("resources") { ] deps = [ - "//chromeos/services/bluetooth_config/public/mojom:mojom_js", - # Generated ml service js bindings are required by external clients, the # clients are not found within Chromium. The clients pull the generated # js bindings as part of their build process. diff --git a/chromeos/resources/chromeos_resources.grd b/chromeos/resources/chromeos_resources.grd index 4ab026e70015be..c4ce7ea06f0be9 100644 --- a/chromeos/resources/chromeos_resources.grd +++ b/chromeos/resources/chromeos_resources.grd @@ -12,7 +12,6 @@ - diff --git a/chromeos/resources/cros_bluetooth_config_resources.grdp b/chromeos/resources/cros_bluetooth_config_resources.grdp deleted file mode 100644 index e7db4395bf13eb..00000000000000 --- a/chromeos/resources/cros_bluetooth_config_resources.grdp +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/chromeos/services/BUILD.gn b/chromeos/services/BUILD.gn index 6ec2e61ed20088..a0328e900c340b 100644 --- a/chromeos/services/BUILD.gn +++ b/chromeos/services/BUILD.gn @@ -19,7 +19,6 @@ source_set("unit_tests") { deps = [ "//chromeos/ash/services/assistant:tests", "//chromeos/ash/services/federated/public/cpp:unit_tests", - "//chromeos/services/bluetooth_config:unit_tests", "//chromeos/services/machine_learning/public/cpp:unit_tests", "//chromeos/services/network_config:unit_tests", "//chromeos/services/tts:services_unittests", diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc index cfdedbf912569b..73a672a1897a98 100644 --- a/content/browser/webui/shared_resources_data_source.cc +++ b/content/browser/webui/shared_resources_data_source.cc @@ -58,7 +58,6 @@ const std::set GetContentResourceIds() { #if BUILDFLAG(IS_CHROMEOS_ASH) const std::set GetChromeosMojoResourceIds() { return std::set{ - IDR_BLUETOOTH_CONFIG_MOJOM_WEBUI_JS, IDR_IP_ADDRESS_MOJOM_HTML, IDR_IP_ADDRESS_MOJOM_LITE_JS, IDR_IP_ADDRESS_MOJOM_WEBUI_JS, @@ -81,6 +80,7 @@ const std::set GetChromeosMojoResourceIds() { const std::set GetAshMojoResourceIds() { return std::set{ IDR_AUTH_FACTOR_CONFIG_MOJOM_WEBUI_JS, + IDR_BLUETOOTH_CONFIG_MOJOM_WEBUI_JS, IDR_CELLULAR_SETUP_MOJOM_HTML, IDR_CELLULAR_SETUP_MOJOM_LITE_JS, IDR_ESIM_MANAGER_MOJOM_HTML, diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn b/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn index 758b734a5b6f52..d2d1ae02eb5d83 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/BUILD.gn @@ -43,7 +43,7 @@ js_library("bluetooth_metrics_utils") { js_library("bluetooth_utils") { deps = [ ":bluetooth_types", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", ] } @@ -56,7 +56,7 @@ js_library("bluetooth_types") { js_library("bluetooth_icon") { deps = [ ":bluetooth_icons", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] } @@ -65,7 +65,7 @@ js_library("bluetooth_pairing_device_item") { deps = [ ":bluetooth_icon", ":bluetooth_types", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] } @@ -94,7 +94,7 @@ js_library("bluetooth_pairing_device_selection_page") { ":bluetooth_base_page", ":bluetooth_pairing_device_item", ":bluetooth_types", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_elements:cr_scrollable_behavior", @@ -106,7 +106,7 @@ js_library("bluetooth_pairing_device_selection_page") { js_library("bluetooth_pairing_request_code_page") { deps = [ ":bluetooth_base_page", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] externs_list = @@ -124,7 +124,7 @@ js_library("bluetooth_pairing_enter_code_page") { deps = [ ":bluetooth_base_page", ":bluetooth_types", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] } @@ -135,7 +135,7 @@ js_library("bluetooth_pairing_ui") { ":bluetooth_pairing_device_selection_page", ":bluetooth_pairing_request_code_page", ":cros_bluetooth_config", - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/js:assert.m", ] @@ -153,7 +153,7 @@ js_library("bluetooth_base_page") { js_library("bluetooth_battery_icon_percentage") { deps = [ - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils", "//ui/webui/resources/js:i18n_behavior.m", @@ -162,7 +162,7 @@ js_library("bluetooth_battery_icon_percentage") { js_library("bluetooth_device_battery_info") { deps = [ - "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils", "//ui/webui/resources/js:i18n_behavior.m", @@ -171,7 +171,8 @@ js_library("bluetooth_device_battery_info") { } js_library("cros_bluetooth_config") { - deps = [ "//chromeos/services/bluetooth_config/public/mojom:mojom_webui_js" ] + deps = + [ "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js" ] } js_library("bluetooth_spinner_page") { diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage.js index cd81751a970512..fce6c17e5df43f 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_battery_icon_percentage.js @@ -15,7 +15,7 @@ import './bluetooth_icons.js'; import {I18nBehavior, I18nBehaviorInterface} from '//resources/js/i18n_behavior.m.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assert} from 'chrome://resources/js/assert.m.js'; -import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {BatteryType} from './bluetooth_types.js'; import {getBatteryPercentage} from './bluetooth_utils.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_device_battery_info.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_device_battery_info.js index ff58541fb10edf..6a0e73a365a0ad 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_device_battery_info.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_device_battery_info.js @@ -11,7 +11,7 @@ import '../../../cr_elements/cr_shared_style.css.js'; import './bluetooth_battery_icon_percentage.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {BatteryType} from './bluetooth_types.js'; import {getBatteryPercentage, hasAnyDetailedBatteryInfo} from './bluetooth_utils.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_icon.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_icon.js index 996522709ba7a8..9bea7a416abaab 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_icon.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_icon.js @@ -10,7 +10,7 @@ import './bluetooth_icons.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {BluetoothDeviceProperties, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {hasDefaultImage} from './bluetooth_utils.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item.js index 0f4e8799102d34..d02020a4ecd3b2 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_item.js @@ -13,7 +13,7 @@ import './bluetooth_icon.js'; import {I18nBehavior, I18nBehaviorInterface} from '//resources/js/i18n_behavior.m.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {FocusRowBehavior} from 'chrome://resources/js/cr/ui/focus_row_behavior.js'; -import {BluetoothDeviceProperties, DeviceType} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, DeviceType} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {assertNotReached} from '../../../js/assert.m.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page.js index df183d0edceca3..7bb596471a2233 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_device_selection_page.js @@ -16,7 +16,7 @@ import '../../localized_link/localized_link.js'; import {CrScrollableBehavior, CrScrollableBehaviorInterface} from '//resources/cr_elements/cr_scrollable_behavior.js'; import {I18nBehavior, I18nBehaviorInterface} from '//resources/js/i18n_behavior.m.js'; import {afterNextRender, html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {ButtonBarState, ButtonState, DeviceItemState} from './bluetooth_types.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page.js index c0aa0710c7eb1a..a55710410d5af8 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_request_code_page.js @@ -14,7 +14,7 @@ import '../../../cr_elements/cr_input/cr_input.js'; import {I18nBehavior, I18nBehaviorInterface} from '//resources/js/i18n_behavior.m.js'; import {afterNextRender, html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {ButtonBarState, ButtonState, PairingAuthType} from './bluetooth_types.js'; import {mojoString16ToString} from './bluetooth_utils.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_ui.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_ui.js index 45f7d4cbb64b6a..86b5ae0825e49a 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_ui.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_ui.js @@ -15,7 +15,7 @@ import './bluetooth_pairing_confirm_code_page.js'; import './bluetooth_spinner_page.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {BluetoothDeviceProperties, BluetoothDiscoveryDelegateInterface, BluetoothDiscoveryDelegateReceiver, BluetoothSystemState, DevicePairingDelegateInterface, DevicePairingDelegateReceiver, DevicePairingHandlerInterface, KeyEnteredHandlerInterface, KeyEnteredHandlerPendingReceiver, KeyEnteredHandlerReceiver, PairingResult, SystemPropertiesObserverInterface, SystemPropertiesObserverReceiver} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, BluetoothDiscoveryDelegateInterface, BluetoothDiscoveryDelegateReceiver, BluetoothSystemState, DevicePairingDelegateInterface, DevicePairingDelegateReceiver, DevicePairingHandlerInterface, KeyEnteredHandlerInterface, KeyEnteredHandlerPendingReceiver, KeyEnteredHandlerReceiver, PairingResult, SystemPropertiesObserverInterface, SystemPropertiesObserverReceiver} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {assert, assertNotReached} from '../../../js/assert.m.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_utils.js b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_utils.js index 04112f74284cac..7687ac68dc937b 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_utils.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_utils.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {BluetoothDeviceProperties, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {BluetoothDeviceProperties, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {String16} from 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-webui.js'; import {BatteryType} from './bluetooth_types.js'; diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js b/ui/webui/resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js index ed2010e82d8b45..2f02992d2fbaef 100644 --- a/ui/webui/resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js +++ b/ui/webui/resources/cr_components/chromeos/bluetooth/cros_bluetooth_config.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {CrosBluetoothConfig, CrosBluetoothConfigInterface} from 'chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; +import {CrosBluetoothConfig, CrosBluetoothConfigInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; /** * @fileoverview diff --git a/ui/webui/resources/mojo/BUILD.gn b/ui/webui/resources/mojo/BUILD.gn index 7ff9d0436315f0..89c136eda775a9 100644 --- a/ui/webui/resources/mojo/BUILD.gn +++ b/ui/webui/resources/mojo/BUILD.gn @@ -50,15 +50,15 @@ ts_library("library") { if (is_chromeos_ash) { in_files += [ "ui/gfx/range/mojom/range.mojom-webui.js", - "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", "chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-webui.js", + "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js", "chromeos/services/network_config/public/mojom/network_types.mojom-webui.js", "chromeos/services/network_health/public/mojom/network_diagnostics.mojom-webui.js", "chromeos/services/network_health/public/mojom/network_health.mojom-webui.js", ] extra_deps += [ "//chromeos/ash/services/auth_factor_config/public/mojom:mojom_js__generator", - "//chromeos/services/bluetooth_config/public/mojom:mojom_js__generator", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_js__generator", "//chromeos/services/network_config/public/mojom:network_types_js__generator", "//chromeos/services/network_health/public/mojom:mojom_js__generator", "//ui/gfx/range/mojom:mojom_js__generator",