diff options
Diffstat (limited to 'chromium/ash/public/cpp')
| -rw-r--r-- | chromium/ash/public/cpp/BUILD.gn | 40 | ||||
| -rw-r--r-- | chromium/ash/public/cpp/external_arc/BUILD.gn | 89 |
2 files changed, 115 insertions, 14 deletions
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 911b526aa92..118697ba72e 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -21,10 +21,12 @@ component("cpp") { "ambient/ambient_backend_controller.h", "ambient/ambient_client.cc", "ambient/ambient_client.h", - "ambient/ambient_mode_state.cc", - "ambient/ambient_mode_state.h", "ambient/ambient_prefs.cc", "ambient/ambient_prefs.h", + "ambient/ambient_ui_model.cc", + "ambient/ambient_ui_model.h", + "ambient/common/ambient_settings.cc", + "ambient/common/ambient_settings.h", "android_intent_helper.cc", "android_intent_helper.h", "app_list/app_list_client.h", @@ -49,10 +51,6 @@ component("cpp") { "app_types.h", "arc_app_id_provider.cc", "arc_app_id_provider.h", - "arc_notification_manager_base.cc", - "arc_notification_manager_base.h", - "arc_notifications_host_initializer.cc", - "arc_notifications_host_initializer.h", "ash_constants.h", "ash_features.cc", "ash_features.h", @@ -78,11 +76,15 @@ component("cpp") { "assistant/assistant_web_view.h", "assistant/assistant_web_view_factory.cc", "assistant/assistant_web_view_factory.h", + "assistant/controller/assistant_alarm_timer_controller.cc", + "assistant/controller/assistant_alarm_timer_controller.h", "assistant/controller/assistant_controller.cc", "assistant/controller/assistant_controller.h", "assistant/controller/assistant_controller_observer.h", "assistant/controller/assistant_interaction_controller.cc", "assistant/controller/assistant_interaction_controller.h", + "assistant/controller/assistant_screen_context_controller.cc", + "assistant/controller/assistant_screen_context_controller.h", "assistant/controller/assistant_suggestions_controller.cc", "assistant/controller/assistant_suggestions_controller.h", "assistant/controller/assistant_ui_controller.cc", @@ -91,12 +93,6 @@ component("cpp") { "assistant/conversation_starter.h", "assistant/conversation_starters_client.cc", "assistant/conversation_starters_client.h", - "assistant/proactive_suggestions.cc", - "assistant/proactive_suggestions.h", - "assistant/proactive_suggestions_client.cc", - "assistant/proactive_suggestions_client.h", - "assistant/util/histogram_util.cc", - "assistant/util/histogram_util.h", "back_gesture_contextual_nudge_controller.h", "back_gesture_contextual_nudge_delegate.h", "caption_buttons/caption_button_model.h", @@ -140,6 +136,8 @@ component("cpp") { "immersive/immersive_fullscreen_controller_delegate.h", "immersive/immersive_revealed_lock.cc", "immersive/immersive_revealed_lock.h", + "keyboard/arc/arc_input_method_bounds_tracker.cc", + "keyboard/arc/arc_input_method_bounds_tracker.h", "keyboard/keyboard_config.h", "keyboard/keyboard_controller.cc", "keyboard/keyboard_controller.h", @@ -166,6 +164,14 @@ component("cpp") { "media_client.h", "media_controller.cc", "media_controller.h", + "message_center/arc_notification_constants.h", + "message_center/arc_notification_manager_base.cc", + "message_center/arc_notification_manager_base.h", + "message_center/arc_notification_manager_delegate.h", + "message_center/arc_notifications_host_initializer.cc", + "message_center/arc_notifications_host_initializer.h", + "metrics_util.cc", + "metrics_util.h", "network_config_service.cc", "network_config_service.h", "network_icon_image_source.cc", @@ -192,13 +198,18 @@ component("cpp") { "power_utils.h", "presentation_time_recorder.cc", "presentation_time_recorder.h", - "quick_answers_controller.cc", - "quick_answers_controller.h", + "quick_answers/controller/quick_answers_controller.cc", + "quick_answers/controller/quick_answers_controller.h", "rounded_corner_decorator.cc", "rounded_corner_decorator.h", "scale_utility.cc", "scale_utility.h", "scoped_guest_button_blocker.h", + "scoped_singleton_resetter_for_test.h", + "screen_backlight.cc", + "screen_backlight.h", + "screen_backlight_observer.h", + "screen_backlight_type.h", "select_to_speak_event_handler_delegate.h", "session/session_activation_observer.h", "session/session_controller.cc", @@ -352,6 +363,7 @@ source_set("test_support") { deps = [ ":cpp", "//base", + "//services/device/public/cpp:test_support", "//services/network/public/cpp:cpp", "//ui/aura", "//ui/aura:test_support", diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn new file mode 100644 index 00000000000..036ad65ec52 --- /dev/null +++ b/chromium/ash/public/cpp/external_arc/BUILD.gn @@ -0,0 +1,89 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +import("//build/config/ui.gni") +static_library("external_arc") { + sources = [ + "keyboard/arc_input_method_surface_manager.cc", + "keyboard/arc_input_method_surface_manager.h", + "message_center/arc_notification_content_view.cc", + "message_center/arc_notification_content_view.h", + "message_center/arc_notification_delegate.cc", + "message_center/arc_notification_delegate.h", + "message_center/arc_notification_item.h", + "message_center/arc_notification_item_impl.cc", + "message_center/arc_notification_item_impl.h", + "message_center/arc_notification_manager.cc", + "message_center/arc_notification_manager.h", + "message_center/arc_notification_surface.h", + "message_center/arc_notification_surface_impl.cc", + "message_center/arc_notification_surface_impl.h", + "message_center/arc_notification_surface_manager.cc", + "message_center/arc_notification_surface_manager.h", + "message_center/arc_notification_surface_manager_impl.cc", + "message_center/arc_notification_surface_manager_impl.h", + "message_center/arc_notification_view.cc", + "message_center/arc_notification_view.h", + ] + defines = [ "ASH_PUBLIC_IMPLEMENTATION" ] + deps = [ + "//ash/public/cpp", + "//base", + "//components/account_id", + "//components/arc:arc_metrics_constants", + "//components/arc:connection_holder", + "//components/arc/mojom:notifications", + "//components/exo", + "//mojo/public/cpp/system", + "//ui/message_center", + "//ui/views", + "//ui/wm", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "keyboard/arc_input_method_surface_manager_unittest.cc", + "message_center/arc_notification_content_view_unittest.cc", + "message_center/arc_notification_manager_unittest.cc", + "message_center/arc_notification_view_unittest.cc", + ] + public_deps = [ "//ash:test_support" ] + deps = [ + ":external_arc", + ":test_support", + "//ash", + "//ash:test_support", + "//ash/public/cpp", + "//base/test:test_support", + "//components/arc:connection_holder", + "//components/arc:notification_test_support", + "//components/exo", + "//components/exo:test_support", + "//testing/gmock", + "//ui/aura:test_support", + "//ui/base:test_support", + "//ui/events:test_support", + "//ui/message_center:test_support", + "//ui/views:test_support", + ] + + assert_no_deps = [ "//compponents/arc:arc_base" ] +} + +source_set("test_support") { + testonly = true + sources = [ + "message_center/mock_arc_notification_item.cc", + "message_center/mock_arc_notification_item.h", + "message_center/mock_arc_notification_surface.cc", + "message_center/mock_arc_notification_surface.h", + ] + deps = [ + ":external_arc", + "//ash/public/cpp", + "//base", + "//ui/aura", + ] +} |