diff options
Diffstat (limited to 'chromium/ash/BUILD.gn')
| -rw-r--r-- | chromium/ash/BUILD.gn | 343 |
1 files changed, 296 insertions, 47 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index 65beaf4e972..b172a0d1b09 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -4,7 +4,11 @@ import("//build/config/features.gni") import("//build/config/ui.gni") +import("//mojo/public/tools/bindings/mojom.gni") +import("//services/service_manager/public/cpp/service.gni") +import("//services/service_manager/public/service_manifest.gni") import("//testing/test.gni") +import("//tools/grit/repack.gni") import("//ui/base/ui_features.gni") # Historical note: Ash shipped on Windows for a couple years to support @@ -24,8 +28,14 @@ component("ash") { "accelerators/accelerator_controller_delegate.h", "accelerators/accelerator_controller_delegate_classic.cc", "accelerators/accelerator_controller_delegate_classic.h", + "accelerators/accelerator_controller_delegate_mash.cc", + "accelerators/accelerator_controller_delegate_mash.h", + "accelerators/accelerator_controller_registrar.cc", + "accelerators/accelerator_controller_registrar.h", "accelerators/accelerator_delegate.cc", "accelerators/accelerator_delegate.h", + "accelerators/accelerator_handler.h", + "accelerators/accelerator_ids.h", "accelerators/accelerator_router.cc", "accelerators/accelerator_router.h", "accelerators/accelerator_table.cc", @@ -53,15 +63,16 @@ component("ash") { "accessibility/accessibility_focus_ring_controller.h", "accessibility/accessibility_focus_ring_layer.cc", "accessibility/accessibility_focus_ring_layer.h", + "accessibility/accessibility_highlight_layer.cc", + "accessibility/accessibility_highlight_layer.h", + "accessibility/accessibility_layer.cc", + "accessibility/accessibility_layer.h", "accessibility/default_accessibility_delegate.cc", "accessibility/default_accessibility_delegate.h", "accessibility/focus_ring_controller.cc", "accessibility/focus_ring_controller.h", "accessibility/focus_ring_layer.cc", "accessibility/focus_ring_layer.h", - - # TODO(jamescook): Move parts of this into //ash/public/cpp - "accessibility_types.h", "animation/animation_change_type.h", "app_list/app_list_delegate_impl.cc", "app_list/app_list_delegate_impl.h", @@ -87,6 +98,8 @@ component("ash") { "debug.h", "default_wallpaper_delegate.cc", "default_wallpaper_delegate.h", + "disconnected_app_handler.cc", + "disconnected_app_handler.h", "display/ash_display_controller.cc", "display/ash_display_controller.h", "display/cursor_window_controller.cc", @@ -100,6 +113,10 @@ component("ash") { "display/display_configuration_controller.h", "display/display_error_observer_chromeos.cc", "display/display_error_observer_chromeos.h", + "display/display_move_window_util.cc", + "display/display_move_window_util.h", + "display/display_synchronizer.cc", + "display/display_synchronizer.h", "display/display_util.cc", "display/display_util.h", "display/event_transformation_handler.cc", @@ -145,6 +162,8 @@ component("ash") { "drag_drop/drag_drop_tracker.h", "drag_drop/drag_image_view.cc", "drag_drop/drag_image_view.h", + "event_matcher_util.cc", + "event_matcher_util.h", "fast_ink/fast_ink_pointer_controller.cc", "fast_ink/fast_ink_pointer_controller.h", "fast_ink/fast_ink_points.cc", @@ -160,6 +179,8 @@ component("ash") { "focus_cycler.cc", "focus_cycler.h", "frame/caption_buttons/caption_button_types.h", + "frame/caption_buttons/frame_back_button.cc", + "frame/caption_buttons/frame_back_button.h", "frame/caption_buttons/frame_caption_button.cc", "frame/caption_buttons/frame_caption_button.h", "frame/caption_buttons/frame_caption_button_container_view.cc", @@ -169,18 +190,17 @@ component("ash") { "frame/caption_buttons/frame_size_button_delegate.h", "frame/custom_frame_view_ash.cc", "frame/custom_frame_view_ash.h", - "frame/default_header_painter.cc", - "frame/default_header_painter.h", + "frame/default_frame_header.cc", + "frame/default_frame_header.h", + "frame/detached_title_area_renderer.cc", + "frame/detached_title_area_renderer.h", "frame/frame_border_hit_test.cc", "frame/frame_border_hit_test.h", - "frame/header_painter.h", - "frame/header_painter_util.cc", - "frame/header_painter_util.h", + "frame/frame_header.h", + "frame/frame_header_util.cc", + "frame/frame_header_util.h", "frame/header_view.cc", "frame/header_view.h", - "gpu_support.h", - "gpu_support_stub.cc", - "gpu_support_stub.h", "high_contrast/high_contrast_controller.cc", "high_contrast/high_contrast_controller.h", "highlighter/highlighter_controller.cc", @@ -194,6 +214,11 @@ component("ash") { "host/ash_window_tree_host.cc", "host/ash_window_tree_host.h", "host/ash_window_tree_host_init_params.h", + "host/ash_window_tree_host_mirroring_delegate.h", + "host/ash_window_tree_host_mirroring_unified.cc", + "host/ash_window_tree_host_mirroring_unified.h", + "host/ash_window_tree_host_mus.cc", + "host/ash_window_tree_host_mus.h", "host/ash_window_tree_host_platform.cc", "host/ash_window_tree_host_platform.h", "host/ash_window_tree_host_unified.cc", @@ -208,6 +233,8 @@ component("ash") { "keyboard/keyboard_observer_register.h", "keyboard/keyboard_ui.cc", "keyboard/keyboard_ui.h", + "keyboard/keyboard_ui_mash.cc", + "keyboard/keyboard_ui_mash.h", "keyboard/keyboard_ui_observer.h", "laser/laser_pointer_controller.cc", "laser/laser_pointer_controller.h", @@ -225,12 +252,18 @@ component("ash") { "lock_screen_action/lock_screen_action_background_state.h", "lock_screen_action/lock_screen_action_background_view.cc", "lock_screen_action/lock_screen_action_background_view.h", + "lock_screen_action/lock_screen_note_display_state_handler.cc", + "lock_screen_action/lock_screen_note_display_state_handler.h", + "lock_screen_action/lock_screen_note_launcher.cc", + "lock_screen_action/lock_screen_note_launcher.h", "login/lock_screen_apps_focus_observer.h", - "login/lock_screen_controller.cc", - "login/lock_screen_controller.h", + "login/login_screen_controller.cc", + "login/login_screen_controller.h", "login/ui/animated_rounded_image_view.cc", "login/ui/animated_rounded_image_view.h", "login/ui/animation_frame.h", + "login/ui/hover_notifier.cc", + "login/ui/hover_notifier.h", "login/ui/image_parser.cc", "login/ui/image_parser.h", "login/ui/layout_util.cc", @@ -249,6 +282,8 @@ component("ash") { "login/ui/login_base_bubble_view.h", "login/ui/login_bubble.cc", "login/ui/login_bubble.h", + "login/ui/login_button.cc", + "login/ui/login_button.h", "login/ui/login_constants.h", "login/ui/login_data_dispatcher.cc", "login/ui/login_data_dispatcher.h", @@ -290,6 +325,8 @@ component("ash") { "metrics/desktop_task_switch_metric_recorder.cc", "metrics/desktop_task_switch_metric_recorder.h", "metrics/gesture_action_type.h", + "metrics/login_metrics_recorder.cc", + "metrics/login_metrics_recorder.h", "metrics/pointer_metrics_recorder.cc", "metrics/pointer_metrics_recorder.h", "metrics/task_switch_metrics_recorder.cc", @@ -304,9 +341,12 @@ component("ash") { "mojo_interface_factory.h", "multi_profile_uma.cc", "multi_profile_uma.h", + "network_connect_delegate_mus.cc", + "network_connect_delegate_mus.h", "new_window_controller.cc", "new_window_controller.h", - "palette_delegate.h", + "note_taking_controller.cc", + "note_taking_controller.h", "pointer_watcher_adapter_classic.cc", "pointer_watcher_adapter_classic.h", "root_window_controller.cc", @@ -339,6 +379,8 @@ component("ash") { "shelf/app_list_button.h", "shelf/app_list_shelf_item_delegate.cc", "shelf/app_list_shelf_item_delegate.h", + "shelf/assistant_overlay.cc", + "shelf/assistant_overlay.h", "shelf/ink_drop_button_listener.h", "shelf/login_shelf_view.cc", "shelf/login_shelf_view.h", @@ -384,19 +426,28 @@ component("ash") { "shelf/shelf_window_watcher.h", "shelf/shelf_window_watcher_item_delegate.cc", "shelf/shelf_window_watcher_item_delegate.h", - "shelf/voice_interaction_overlay.cc", - "shelf/voice_interaction_overlay.h", "shell.cc", "shell.h", "shell_delegate.h", + "shell_delegate_mus.cc", + "shell_delegate_mus.h", + "shell_init_params.cc", "shell_init_params.h", "shell_observer.h", "shell_port.cc", "shell_port.h", "shell_port_classic.cc", "shell_port_classic.h", + "shell_port_mash.cc", + "shell_port_mash.h", + "shell_port_mus.cc", + "shell_port_mus.h", "shutdown_controller.cc", "shutdown_controller.h", + "sidebar/sidebar.cc", + "sidebar/sidebar.h", + "sidebar/sidebar_widget.cc", + "sidebar/sidebar_widget.h", "sticky_keys/sticky_keys_controller.cc", "sticky_keys/sticky_keys_controller.h", "sticky_keys/sticky_keys_overlay.cc", @@ -508,6 +559,8 @@ component("ash") { "system/palette/palette_tray.h", "system/palette/palette_utils.cc", "system/palette/palette_utils.h", + "system/palette/palette_welcome_bubble.cc", + "system/palette/palette_welcome_bubble.h", "system/palette/tools/capture_region_mode.cc", "system/palette/tools/capture_region_mode.h", "system/palette/tools/capture_screen_action.cc", @@ -520,6 +573,8 @@ component("ash") { "system/palette/tools/magnifier_mode.h", "system/palette/tools/metalayer_mode.cc", "system/palette/tools/metalayer_mode.h", + "system/power/backlights_forced_off_setter.cc", + "system/power/backlights_forced_off_setter.h", "system/power/battery_notification.cc", "system/power/battery_notification.h", "system/power/dual_role_notification.cc", @@ -530,12 +585,16 @@ component("ash") { "system/power/power_button_controller.h", "system/power/power_button_display_controller.cc", "system/power/power_button_display_controller.h", + "system/power/power_button_screenshot_controller.cc", + "system/power/power_button_screenshot_controller.h", "system/power/power_event_observer.cc", "system/power/power_event_observer.h", "system/power/power_status.cc", "system/power/power_status.h", "system/power/power_status_view.cc", "system/power/power_status_view.h", + "system/power/scoped_backlights_forced_off.cc", + "system/power/scoped_backlights_forced_off.h", "system/power/tablet_power_button_controller.cc", "system/power/tablet_power_button_controller.h", "system/power/tray_power.cc", @@ -605,6 +664,8 @@ component("ash") { "system/tray/system_tray_item.h", "system/tray/system_tray_notifier.cc", "system/tray/system_tray_notifier.h", + "system/tray/system_tray_view.cc", + "system/tray/system_tray_view.h", "system/tray/tray_background_view.cc", "system/tray/tray_background_view.h", "system/tray/tray_bubble_wrapper.cc", @@ -682,6 +743,8 @@ component("ash") { "touch/touch_hud_projection.h", "touch/touch_observer_hud.cc", "touch/touch_observer_hud.h", + "touch/touch_transform_setter_mus.cc", + "touch/touch_transform_setter_mus.h", "touch/touch_uma.cc", "touch/touch_uma.h", "tray_action/tray_action.cc", @@ -693,21 +756,34 @@ component("ash") { "utility/transformer_util.h", "virtual_keyboard_controller.cc", "virtual_keyboard_controller.h", + "voice_interaction/voice_interaction_controller.cc", + "voice_interaction/voice_interaction_controller.h", + "voice_interaction/voice_interaction_observer.h", "wallpaper/wallpaper_controller.cc", "wallpaper/wallpaper_controller.h", "wallpaper/wallpaper_controller_observer.h", "wallpaper/wallpaper_delegate.h", + "wallpaper/wallpaper_delegate_mus.cc", + "wallpaper/wallpaper_delegate_mus.h", "wallpaper/wallpaper_view.cc", "wallpaper/wallpaper_view.h", "wallpaper/wallpaper_widget_controller.cc", "wallpaper/wallpaper_widget_controller.h", "wallpaper/wallpaper_window_state_manager.cc", "wallpaper/wallpaper_window_state_manager.h", + "window_manager.cc", + "window_manager.h", + "window_manager_service.cc", + "window_manager_service.h", "window_user_data.h", "wm/always_on_top_controller.cc", "wm/always_on_top_controller.h", "wm/ash_focus_rules.cc", "wm/ash_focus_rules.h", + "wm/base_state.cc", + "wm/base_state.h", + "wm/client_controlled_state.cc", + "wm/client_controlled_state.h", "wm/container_finder.cc", "wm/container_finder.h", "wm/cursor_manager_chromeos.cc", @@ -722,6 +798,8 @@ component("ash") { "wm/drag_window_controller.h", "wm/drag_window_resizer.cc", "wm/drag_window_resizer.h", + "wm/drag_window_resizer_mash.cc", + "wm/drag_window_resizer_mash.h", "wm/event_client_impl.cc", "wm/event_client_impl.h", "wm/focus_rules.cc", @@ -738,6 +816,8 @@ component("ash") { "wm/immersive_gesture_handler_classic.h", "wm/immersive_handler_factory_ash.cc", "wm/immersive_handler_factory_ash.h", + "wm/immersive_handler_factory_mash.cc", + "wm/immersive_handler_factory_mash.h", "wm/lock_action_handler_layout_manager.cc", "wm/lock_action_handler_layout_manager.h", "wm/lock_layout_manager.cc", @@ -747,6 +827,8 @@ component("ash") { "wm/lock_state_observer.h", "wm/lock_window_state.cc", "wm/lock_window_state.h", + "wm/move_event_handler.cc", + "wm/move_event_handler.h", "wm/mru_window_tracker.cc", "wm/mru_window_tracker.h", "wm/native_cursor_manager_ash.h", @@ -754,6 +836,8 @@ component("ash") { "wm/native_cursor_manager_ash_classic.h", "wm/native_cursor_manager_ash_mus.cc", "wm/native_cursor_manager_ash_mus.h", + "wm/non_client_frame_controller.cc", + "wm/non_client_frame_controller.h", "wm/overlay_event_filter.cc", "wm/overlay_event_filter.h", "wm/overview/cleanup_animation_observer.cc", @@ -761,6 +845,8 @@ component("ash") { "wm/overview/overview_animation_type.h", "wm/overview/overview_window_drag_controller.cc", "wm/overview/overview_window_drag_controller.h", + "wm/overview/rounded_rect_view.cc", + "wm/overview/rounded_rect_view.h", "wm/overview/scoped_hide_overview_windows.cc", "wm/overview/scoped_hide_overview_windows.h", "wm/overview/scoped_overview_animation_settings.cc", @@ -786,6 +872,8 @@ component("ash") { "wm/panels/panel_window_event_handler.h", "wm/panels/panel_window_resizer.cc", "wm/panels/panel_window_resizer.h", + "wm/property_util.cc", + "wm/property_util.h", "wm/resize_handle_window_targeter.cc", "wm/resize_handle_window_targeter.h", "wm/resize_shadow.cc", @@ -843,6 +931,8 @@ component("ash") { "wm/tablet_mode/tablet_mode_window_state.h", "wm/tablet_mode/touchpad_and_keyboard_disabler.cc", "wm/tablet_mode/touchpad_and_keyboard_disabler.h", + "wm/top_level_window_factory.cc", + "wm/top_level_window_factory.h", "wm/toplevel_window_event_handler.cc", "wm/toplevel_window_event_handler.h", "wm/video_detector.cc", @@ -905,6 +995,8 @@ component("ash") { "wm/workspace/workspace_event_handler.h", "wm/workspace/workspace_event_handler_classic.cc", "wm/workspace/workspace_event_handler_classic.h", + "wm/workspace/workspace_event_handler_mash.cc", + "wm/workspace/workspace_event_handler_mash.h", "wm/workspace/workspace_layout_manager.cc", "wm/workspace/workspace_layout_manager.h", "wm/workspace/workspace_types.h", @@ -918,13 +1010,32 @@ component("ash") { defines = [ "ASH_IMPLEMENTATION" ] public_deps = [ + "//ash/public/cpp", "//ash/resources", "//ash/resources/vector_icons", "//ash/strings", + "//ash/wayland", + "//mash/public/interfaces", + "//mojo/common:common_base", + "//services/ui/common:mus_common", + "//services/ui/public/cpp", + "//services/ui/public/cpp/input_devices", + "//services/ui/public/interfaces", + "//services/ui/public/interfaces/display", + "//skia", + "//ui/aura", + "//ui/events", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", + "//ui/resources", + "//ui/strings", + "//ui/views", + "//ui/views/mus:for_mojo_application", + "//ui/wm", ] deps = [ "//ash/autoclick/common:autoclick", - "//ash/public/cpp:ash_public_cpp", "//ash/touch_hud", "//base", "//base:i18n", @@ -935,6 +1046,8 @@ component("ash") { "//chromeos", "//chromeos:power_manager_proto", "//components/device_event_log", + "//components/exo", + "//components/exo/wayland", "//components/onc", "//components/pref_registry", "//components/prefs", @@ -944,6 +1057,7 @@ component("ash") { "//components/strings", "//components/user_manager", "//components/vector_icons", + "//components/viz/host", "//components/viz/service", "//components/wallpaper", "//device/bluetooth", @@ -954,10 +1068,7 @@ component("ash") { "//services/data_decoder/public/cpp", "//services/preferences/public/cpp", "//services/service_manager/public/cpp", - "//services/ui/public/cpp", - "//services/ui/public/cpp/input_devices", - "//services/ui/public/interfaces", - "//skia", + "//services/ui/public/interfaces/input_devices", # TODO(msw): Remove this; only ash_with_content should depend on webkit. "//third_party/WebKit/public:blink_headers", @@ -966,7 +1077,6 @@ component("ash") { "//third_party/re2", "//ui/accessibility", "//ui/app_list/presenter", - "//ui/aura", "//ui/base", "//ui/base:ui_data_pack", "//ui/base/ime", @@ -979,29 +1089,28 @@ component("ash") { "//ui/display/manager", "//ui/display/types", "//ui/display/util", - "//ui/events", "//ui/events:dom_keycode_converter", "//ui/events:events_base", "//ui/events:gesture_detection", "//ui/events/devices", + "//ui/events/devices/mojo", "//ui/events/ozone:events_ozone", - "//ui/gfx", - "//ui/gfx/geometry", "//ui/keyboard", + "//ui/keyboard:mojom", "//ui/message_center", "//ui/message_center/public/cpp", "//ui/native_theme", "//ui/ozone", "//ui/platform_window", "//ui/platform_window/stub", - "//ui/resources", - "//ui/strings", - "//ui/views", - "//ui/wm", "//ui/wm/public", "//url", ] + data_deps = [ + "//ash/touch_hud/mus:touch_hud", + ] + # TODO(jamescook): Move to ash_unittests? data = [ "display/test_data/", @@ -1012,13 +1121,16 @@ component("ash") { "//content/public/browser", "//content/public/common", ] + + allow_circular_includes_from = [ + "//components/exo", + "//components/exo/wayland", + ] } component("ash_with_content") { sources = [ "content/ash_with_content_export.h", - "content/gpu_support_impl.cc", - "content/gpu_support_impl.h", "content/keyboard_overlay/keyboard_overlay_delegate.cc", "content/keyboard_overlay/keyboard_overlay_delegate.h", "content/keyboard_overlay/keyboard_overlay_view.cc", @@ -1035,7 +1147,7 @@ component("ash_with_content") { ":ash", ] deps = [ - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//base", "//base/third_party/dynamic_annotations", "//content/public/browser", @@ -1096,7 +1208,7 @@ static_library("ash_shell_lib") { deps = [ ":ash", ":test_support_without_content", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//base", "//base:i18n", "//components/user_manager", @@ -1132,7 +1244,7 @@ static_library("ash_shell_lib_with_content") { ":ash_shell_lib", ":ash_with_content", ":test_support_without_content", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//base:i18n", "//chrome:packed_resources", "//chromeos", @@ -1173,7 +1285,7 @@ test("ash_content_unittests") { ":ash", ":ash_with_content", ":test_support_with_content", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//base", "//base/test:test_support", "//chromeos", @@ -1230,6 +1342,7 @@ test("ash_unittests") { "display/display_configuration_controller_unittest.cc", "display/display_error_observer_chromeos_unittest.cc", "display/display_manager_unittest.cc", + "display/display_move_window_util_unittest.cc", "display/display_util_unittest.cc", "display/extended_mouse_warp_controller_unittest.cc", "display/mirror_window_controller_unittest.cc", @@ -1252,16 +1365,18 @@ test("ash_unittests") { "frame/caption_buttons/frame_caption_button_container_view_unittest.cc", "frame/caption_buttons/frame_size_button_unittest.cc", "frame/custom_frame_view_ash_unittest.cc", - "frame/default_header_painter_unittest.cc", + "frame/default_frame_header_unittest.cc", "highlighter/highlighter_controller_unittest.cc", "highlighter/highlighter_gesture_util_unittest.cc", "ime/ime_controller_unittest.cc", "laser/laser_pointer_controller_unittest.cc", "laser/laser_segment_utils_unittest.cc", "lock_screen_action/lock_screen_action_background_controller_impl_unittest.cc", - "login/lock_screen_controller_unittest.cc", - "login/mock_lock_screen_client.cc", - "login/mock_lock_screen_client.h", + "lock_screen_action/lock_screen_note_display_state_handler_unittest.cc", + "lock_screen_action/lock_screen_note_launcher_unittest.cc", + "login/login_screen_controller_unittest.cc", + "login/mock_login_screen_client.cc", + "login/mock_login_screen_client.h", "login/ui/lock_contents_view_unittest.cc", "login/ui/lock_screen_sanity_unittest.cc", "login/ui/login_auth_user_view_unittest.cc", @@ -1280,11 +1395,11 @@ test("ash_unittests") { "message_center/message_list_view_unittest.cc", "message_center/notifier_settings_view_unittest.cc", "metrics/desktop_task_switch_metric_recorder_unittest.cc", + "metrics/login_metrics_recorder_unittest.cc", "metrics/pointer_metrics_recorder_unittest.cc", "metrics/task_switch_metrics_recorder_unittest.cc", "metrics/task_switch_time_tracker_unittest.cc", "metrics/user_metrics_recorder_unittest.cc", - "mus/window_manager_common_unittests.cc", "mus_property_mirror_ash_unittest.cc", "pointer_watcher_adapter_classic_unittest.cc", "root_window_controller_unittest.cc", @@ -1332,10 +1447,13 @@ test("ash_unittests") { "system/palette/mock_palette_tool_delegate.h", "system/palette/palette_tool_manager_unittest.cc", "system/palette/palette_tray_unittest.cc", + "system/palette/palette_welcome_bubble_unittest.cc", "system/palette/tools/create_note_unittest.cc", "system/palette/tools/metalayer_unittest.cc", "system/palette/tools/screenshot_unittest.cc", + "system/power/backlights_forced_off_setter_unittest.cc", "system/power/peripheral_battery_notifier_unittest.cc", + "system/power/power_button_screenshot_controller_unittest.cc", "system/power/power_event_observer_unittest.cc", "system/power/power_status_unittest.cc", "system/power/power_status_view_unittest.cc", @@ -1377,10 +1495,13 @@ test("ash_unittests") { "tray_action/tray_action_unittest.cc", "utility/screenshot_controller_unittest.cc", "virtual_keyboard_controller_unittest.cc", + "voice_interaction/voice_interaction_controller_unittest.cc", "wallpaper/wallpaper_controller_unittest.cc", + "window_manager_common_unittests.cc", "window_user_data_unittest.cc", "wm/always_on_top_controller_unittest.cc", "wm/ash_focus_rules_unittest.cc", + "wm/client_controlled_state_unittest.cc", "wm/container_finder_unittest.cc", "wm/drag_window_resizer_unittest.cc", "wm/gestures/overview_gesture_handler_unittest.cc", @@ -1433,8 +1554,7 @@ test("ash_unittests") { ":ash", ":test_support_without_content", "//ash/autoclick/common:autoclick", - "//ash/mus:lib", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//ash/public/cpp:unit_tests", "//ash/resources", "//ash/resources/vector_icons", @@ -1518,7 +1638,7 @@ test("ash_perftests") { deps = [ ":test_support_without_content", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//base/test:test_support", "//cc/base", "//mojo/edk/embedder:headers", @@ -1598,6 +1718,8 @@ static_library("test_support_common") { testonly = true visibility = [ ":*" ] sources = [ + "accessibility/test_accessibility_controller_client.cc", + "accessibility/test_accessibility_controller_client.h", "accessibility/test_accessibility_delegate.cc", "accessibility/test_accessibility_delegate.h", "app_list/test_app_list_presenter_impl.cc", @@ -1640,6 +1762,8 @@ static_library("test_support_common") { "shelf/overflow_button_test_api.h", "shelf/shelf_button_pressed_metric_tracker_test_api.cc", "shelf/shelf_button_pressed_metric_tracker_test_api.h", + "shelf/shelf_test_api.cc", + "shelf/shelf_test_api.h", "shelf/shelf_view_test_api.cc", "shelf/shelf_view_test_api.h", "shell/toplevel_window.cc", @@ -1648,10 +1772,14 @@ static_library("test_support_common") { "shell_test_api.h", "system/cast/tray_cast_test_api.cc", "system/cast/tray_cast_test_api.h", - "system/palette/test_palette_delegate.cc", - "system/palette/test_palette_delegate.h", + "system/palette/palette_tray_test_api.cc", + "system/palette/palette_tray_test_api.h", + "system/power/power_button_screenshot_controller_test_api.cc", + "system/power/power_button_screenshot_controller_test_api.h", "system/power/power_button_test_base.cc", "system/power/power_button_test_base.h", + "system/power/tablet_power_button_controller_test_api.cc", + "system/power/tablet_power_button_controller_test_api.h", "system/status_area_widget_test_helper.cc", "system/status_area_widget_test_helper.h", "system/tray/system_tray_test_api.cc", @@ -1708,8 +1836,7 @@ static_library("test_support_common") { ] deps = [ "//ash", - "//ash/mus:lib", - "//ash/public/cpp:ash_public_cpp", + "//ash/public/cpp", "//ash/public/interfaces:test_interfaces", "//ash/resources", "//base", @@ -1723,6 +1850,7 @@ static_library("test_support_common") { "//components/user_manager:user_manager", "//components/viz/test:test_support", "//device/bluetooth", + "//services/ui/public/cpp", "//services/ui/public/cpp/input_devices", "//services/ui/public/interfaces", "//skia", @@ -1779,3 +1907,124 @@ static_library("interactive_ui_test_support") { "//ui/gl:test_support", ] } + +service("ash_service") { + output_name = "ash" + + sources = [ + "main.cc", + ] + + deps = [ + ":ash", + ":ash_service_resources", + ":ash_service_resources_200", + "//services/service_manager/public/cpp", + ] + + # TODO(beng): This target relies on //mash/session, but there is a cycle so we + # can't state that dependency here. + data_deps = [ + ":ash_service_resources", + ":ash_service_resources_200", + "//services/ui", + ] +} + +service_manifest("manifest") { + name = "ash" + source = "manifest.json" +} + +# TODO: Load locale-specific strings. +# TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. +repack("ash_service_resources") { + output = "$root_out_dir/ash_service_resources.pak" + sources = [ + "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", + "$root_gen_dir/ash/strings/ash_strings_en-US.pak", + "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak", + "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak", + "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", + "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", + "$root_gen_dir/ui/strings/ui_strings_en-US.pak", + "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", + ] + deps = [ + "//ash/resources", + "//ash/strings", + "//ui/chromeos/resources", + "//ui/chromeos/strings", + "//ui/resources", + "//ui/strings", + "//ui/views/mus:resources", + "//ui/views/resources", + ] +} + +repack("ash_service_resources_200") { + output = "$root_out_dir/ash_service_resources_200.pak" + sources = [ + "$root_gen_dir/ash/resources/ash_resources_200_percent.pak", + "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak", + "$root_gen_dir/ui/resources/ui_resources_200_percent.pak", + "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak", + ] + deps = [ + "//ash/resources", + "//ui/chromeos/resources", + "//ui/resources", + "//ui/views/resources", + ] +} + +source_set("mash_unittests") { + testonly = true + + sources = [ + "app_launch_unittest.cc", + "display/display_synchronizer_unittest.cc", + "window_manager_unittest.cc", + "wm/non_client_frame_controller_unittest.cc", + "wm/top_level_window_factory_unittest.cc", + ] + + deps = [ + ":ash_service_resources", + "//ash", + "//ash:test_support_without_content", + "//ash/public/cpp", + "//base", + "//base/test:test_config", + "//base/test:test_support", + "//mash/quick_launch/public/interfaces:constants", + "//mojo/public/cpp/system", + "//services/service_manager/public/cpp:service_test_support", + "//services/ui/common:mus_common", + "//services/ui/public/cpp", + "//services/ui/public/cpp/input_devices", + "//services/ui/public/interfaces", + "//skia", + "//testing/gtest", + "//ui/aura", + "//ui/aura:test_support", + "//ui/base", + "//ui/base:test_support", + "//ui/compositor:test_support", + "//ui/display", + "//ui/events", + "//ui/events:test_support", + "//ui/gfx:test_support", + "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", + "//ui/message_center", + "//ui/views:test_support", + "//ui/views/mus", + ] + + data_deps = [ + ":ash_service", + "//mash/quick_launch", + "//services/ui/ime/test_ime_driver", + ] +} |