diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/ash/BUILD.gn | |
parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ash/BUILD.gn')
-rw-r--r-- | chromium/ash/BUILD.gn | 123 |
1 files changed, 89 insertions, 34 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index 4f0b48a5ccf..aac61e47b0b 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -56,6 +56,8 @@ component("ash") { "accessibility/accessibility_focus_ring_controller.h", "accessibility/accessibility_focus_ring_layer.cc", "accessibility/accessibility_focus_ring_layer.h", + "accessibility/accessibility_highlight_controller.cc", + "accessibility/accessibility_highlight_controller.h", "accessibility/accessibility_highlight_layer.cc", "accessibility/accessibility_highlight_layer.h", "accessibility/accessibility_layer.cc", @@ -66,13 +68,21 @@ component("ash") { "accessibility/focus_ring_controller.h", "accessibility/focus_ring_layer.cc", "accessibility/focus_ring_layer.h", + "accessibility/touch_accessibility_enabler.cc", + "accessibility/touch_accessibility_enabler.h", + "accessibility/touch_exploration_controller.cc", + "accessibility/touch_exploration_controller.h", "animation/animation_change_type.h", + "app_list/app_list_controller_impl.cc", + "app_list/app_list_controller_impl.h", "app_list/app_list_delegate_impl.cc", "app_list/app_list_delegate_impl.h", "app_list/app_list_presenter_delegate.cc", "app_list/app_list_presenter_delegate.h", "app_list/app_list_presenter_delegate_factory.cc", "app_list/app_list_presenter_delegate_factory.h", + "app_list/app_list_view_delegate_mash.cc", + "app_list/app_list_view_delegate_mash.h", "ash_constants.cc", "ash_constants.h", "ash_export.h", @@ -89,8 +99,6 @@ component("ash") { "cast_config_controller.h", "debug.cc", "debug.h", - "default_wallpaper_delegate.cc", - "default_wallpaper_delegate.h", "disconnected_app_handler.cc", "disconnected_app_handler.h", "display/ash_display_controller.cc", @@ -127,6 +135,10 @@ component("ash") { "display/null_mouse_warp_controller.h", "display/overscan_calibrator.cc", "display/overscan_calibrator.h", + "display/persistent_window_controller.cc", + "display/persistent_window_controller.h", + "display/persistent_window_info.cc", + "display/persistent_window_info.h", "display/projecting_observer_chromeos.cc", "display/projecting_observer_chromeos.h", "display/resolution_notification_controller.cc", @@ -295,11 +307,17 @@ component("ash") { "login/ui/note_action_launch_button.h", "login/ui/pin_keyboard_animation.cc", "login/ui/pin_keyboard_animation.h", + "login/ui/scrollable_users_list_view.cc", + "login/ui/scrollable_users_list_view.h", "login/ui/user_switch_flip_animation.cc", "login/ui/user_switch_flip_animation.h", "login_status.h", + "magnifier/docked_magnifier_controller.cc", + "magnifier/docked_magnifier_controller.h", "magnifier/magnification_controller.cc", "magnifier/magnification_controller.h", + "magnifier/magnifier_scale_utils.cc", + "magnifier/magnifier_scale_utils.h", "magnifier/partial_magnification_controller.cc", "magnifier/partial_magnification_controller.h", "media_controller.cc", @@ -443,6 +461,8 @@ component("ash") { "shell_port_mus.h", "shutdown_controller.cc", "shutdown_controller.h", + "shutdown_reason.cc", + "shutdown_reason.h", "sidebar/sidebar.cc", "sidebar/sidebar.h", "sidebar/sidebar_widget.cc", @@ -491,6 +511,8 @@ component("ash") { "system/enterprise/enterprise_domain_observer.h", "system/enterprise/tray_enterprise.cc", "system/enterprise/tray_enterprise.h", + "system/flag_warning/flag_warning_tray.cc", + "system/flag_warning/flag_warning_tray.h", "system/ime/ime_observer.h", "system/ime/tray_ime_chromeos.cc", "system/ime/tray_ime_chromeos.h", @@ -576,8 +598,6 @@ component("ash") { "system/power/backlights_forced_off_setter.h", "system/power/battery_notification.cc", "system/power/battery_notification.h", - "system/power/convertible_power_button_controller.cc", - "system/power/convertible_power_button_controller.h", "system/power/dual_role_notification.cc", "system/power/dual_role_notification.h", "system/power/peripheral_battery_notifier.cc", @@ -586,10 +606,14 @@ 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_menu_item_view.cc", + "system/power/power_button_menu_item_view.h", + "system/power/power_button_menu_screen_view.cc", + "system/power/power_button_menu_screen_view.h", + "system/power/power_button_menu_view.cc", + "system/power/power_button_menu_view.h", "system/power/power_button_screenshot_controller.cc", "system/power/power_button_screenshot_controller.h", - "system/power/power_button_util.cc", - "system/power/power_button_util.h", "system/power/power_event_observer.cc", "system/power/power_event_observer.h", "system/power/power_status.cc", @@ -598,6 +622,8 @@ component("ash") { "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", "system/power/tray_power.h", "system/power/video_activity_notifier.cc", @@ -685,8 +711,6 @@ component("ash") { "system/tray/tray_item_more.h", "system/tray/tray_item_view.cc", "system/tray/tray_item_view.h", - "system/tray/tray_popup_header_button.cc", - "system/tray/tray_popup_header_button.h", "system/tray/tray_popup_ink_drop_style.h", "system/tray/tray_popup_item_style.cc", "system/tray/tray_popup_item_style.h", @@ -705,6 +729,18 @@ component("ash") { "system/tray_drag_controller.h", "system/tray_tracing.cc", "system/tray_tracing.h", + "system/unified/top_shortcut_button.cc", + "system/unified/top_shortcut_button.h", + "system/unified/top_shortcuts_view.cc", + "system/unified/top_shortcuts_view.h", + "system/unified/unified_system_tray.cc", + "system/unified/unified_system_tray.h", + "system/unified/unified_system_tray_bubble.cc", + "system/unified/unified_system_tray_bubble.h", + "system/unified/unified_system_tray_controller.cc", + "system/unified/unified_system_tray_controller.h", + "system/unified/unified_system_tray_view.cc", + "system/unified/unified_system_tray_view.h", "system/update/tray_update.cc", "system/update/tray_update.h", "system/user/button_from_view.cc", @@ -765,9 +801,6 @@ component("ash") { "wallpaper/wallpaper_controller_observer.h", "wallpaper/wallpaper_decoder.cc", "wallpaper/wallpaper_decoder.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", @@ -848,6 +881,8 @@ component("ash") { "wm/overview/overview_animation_type.h", "wm/overview/overview_utils.cc", "wm/overview/overview_utils.h", + "wm/overview/overview_window_animation_observer.cc", + "wm/overview/overview_window_animation_observer.h", "wm/overview/overview_window_drag_controller.cc", "wm/overview/overview_window_drag_controller.h", "wm/overview/rounded_rect_view.cc", @@ -937,8 +972,6 @@ component("ash") { "wm/tablet_mode/tablet_mode_window_manager.h", "wm/tablet_mode/tablet_mode_window_state.cc", "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", @@ -978,6 +1011,8 @@ component("ash") { "wm/window_state_observer.h", "wm/window_state_util.cc", "wm/window_state_util.h", + "wm/window_transient_descendant_iterator.cc", + "wm/window_transient_descendant_iterator.h", "wm/window_util.cc", "wm/window_util.h", "wm/wm_event.cc", @@ -1019,12 +1054,14 @@ component("ash") { public_deps = [ "//ash/public/cpp", + "//ash/public/cpp/vector_icons", "//ash/resources", "//ash/resources/vector_icons", "//ash/strings", "//ash/wayland", - "//mash/public/interfaces", + "//mash/public/mojom", "//mojo/common:common_base", + "//mojo/common:values_struct_traits", "//services/ui/common:mus_common", "//services/ui/public/cpp", "//services/ui/public/cpp/input_devices", @@ -1044,6 +1081,8 @@ component("ash") { ] deps = [ "//ash/autoclick/common:autoclick", + "//ash/components/autoclick/public/mojom", + "//ash/components/quick_launch/public/mojom", "//ash/touch_hud", "//base", "//base:i18n", @@ -1064,12 +1103,14 @@ component("ash") { "//components/session_manager:base", "//components/signin/core/account_id", "//components/strings", + "//components/sync", "//components/user_manager", "//components/vector_icons", "//components/viz/host", "//components/viz/service", "//components/wallpaper", "//device/bluetooth", + "//extensions/common:common_constants", "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_interface", "//media", @@ -1085,7 +1126,6 @@ component("ash") { "//third_party/qcms", "//third_party/re2", "//ui/accessibility", - "//ui/accessibility:ax_gen", "//ui/app_list/presenter", "//ui/base", "//ui/base:ui_data_pack", @@ -1108,7 +1148,6 @@ component("ash") { "//ui/keyboard", "//ui/keyboard:mojom", "//ui/message_center", - "//ui/message_center/public/cpp", "//ui/native_theme", "//ui/ozone", "//ui/platform_window", @@ -1118,12 +1157,8 @@ component("ash") { ] data_deps = [ - "//ash/touch_hud/mus:touch_hud", - ] - - # TODO(jamescook): Move to ash_unittests? - data = [ - "display/test_data/", + "//ash/components/autoclick:autoclick_app", + "//ash/components/touch_hud:touch_hud_app", ] # Usage of content should be in ash_content_unittests. @@ -1343,6 +1378,9 @@ test("ash_unittests") { "accelerators/spoken_feedback_toggler_unittest.cc", "accessibility/accessibility_controller_unittest.cc", "accessibility/accessibility_focus_ring_controller_unittest.cc", + "accessibility/accessibility_highlight_controller_unittest.cc", + "accessibility/touch_accessibility_enabler_unittest.cc", + "accessibility/touch_exploration_controller_unittest.cc", "app_list/app_list_presenter_delegate_unittest.cc", "ash_touch_exploration_manager_chromeos_unittest.cc", "autoclick/autoclick_unittest.cc", @@ -1357,6 +1395,7 @@ test("ash_unittests") { "display/extended_mouse_warp_controller_unittest.cc", "display/mirror_window_controller_unittest.cc", "display/mouse_cursor_event_filter_unittest.cc", + "display/persistent_window_controller_unittest.cc", "display/projecting_observer_chromeos_unittest.cc", "display/resolution_notification_controller_unittest.cc", "display/root_window_transformers_unittest.cc", @@ -1392,6 +1431,8 @@ test("ash_unittests") { "login/ui/lock_window_unittest.cc", "login/ui/login_auth_user_view_unittest.cc", "login/ui/login_bubble_unittest.cc", + "login/ui/login_keyboard_test_base.cc", + "login/ui/login_keyboard_test_base.h", "login/ui/login_password_view_test.cc", "login/ui/login_pin_view_unittest.cc", "login/ui/login_test_base.cc", @@ -1400,7 +1441,11 @@ test("ash_unittests") { "login/ui/login_test_utils.h", "login/ui/login_user_view_unittest.cc", "login/ui/note_action_launch_button_unittest.cc", + "magnifier/docked_magnifier_controller_unittest.cc", "magnifier/magnification_controller_unittest.cc", + "magnifier/magnifier_scale_utils_unittest.cc", + "magnifier/magnifier_test_utils.cc", + "magnifier/magnifier_test_utils.h", "magnifier/partial_magnification_controller_unittest.cc", "message_center/message_center_view_unittest.cc", "message_center/message_list_view_unittest.cc", @@ -1443,6 +1488,7 @@ test("ash_unittests") { "system/date/date_view_unittest.cc", "system/date/system_info_default_view_unittest.cc", "system/enterprise/tray_enterprise_unittest.cc", + "system/flag_warning/flag_warning_tray_unittest.cc", "system/ime/tray_ime_chromeos_unittest.cc", "system/ime_menu/ime_menu_tray_unittest.cc", "system/keyboard_brightness/tray_keyboard_brightness_unittest.cc", @@ -1464,12 +1510,12 @@ test("ash_unittests") { "system/palette/tools/metalayer_unittest.cc", "system/palette/tools/screenshot_unittest.cc", "system/power/backlights_forced_off_setter_unittest.cc", - "system/power/convertible_power_button_controller_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", + "system/power/tablet_power_button_controller_unittest.cc", "system/power/tray_power_unittest.cc", "system/power/video_activity_notifier_unittest.cc", "system/rotation/tray_rotation_lock_unittest.cc", @@ -1541,7 +1587,6 @@ test("ash_unittests") { "wm/tablet_mode/accelerometer_test_data_literals.cc", "wm/tablet_mode/tablet_mode_controller_unittest.cc", "wm/tablet_mode/tablet_mode_window_manager_unittest.cc", - "wm/tablet_mode/touchpad_and_keyboard_disabler_unittest.cc", "wm/toplevel_window_event_handler_unittest.cc", "wm/video_detector_unittest.cc", "wm/window_animations_unittest.cc", @@ -1567,8 +1612,10 @@ test("ash_unittests") { ":ash", ":test_support_without_content", "//ash/autoclick/common:autoclick", + "//ash/components/shortcut_viewer:ksv_unittests", "//ash/public/cpp", "//ash/public/cpp:unit_tests", + "//ash/public/cpp/vector_icons", "//ash/resources", "//ash/resources/vector_icons", "//ash/strings", @@ -1624,6 +1671,7 @@ test("ash_unittests") { "//ui/message_center:test_support", "//ui/message_center/public/cpp", "//ui/resources", + "//ui/snapshot", "//ui/strings", "//ui/views", "//ui/views:test_support", @@ -1638,6 +1686,11 @@ test("ash_unittests") { "//testing/buildbot/filters:ash_unittests_filters", ] + data = [ + # See DisplayColorManagerTest. + "display/test_data/", + ] + # Usage of content should be in ash_with_content. assert_no_deps = [ "//content/public/browser", @@ -1789,12 +1842,14 @@ static_library("test_support_common") { "system/cast/tray_cast_test_api.h", "system/palette/palette_tray_test_api.cc", "system/palette/palette_tray_test_api.h", - "system/power/convertible_power_button_controller_test_api.cc", - "system/power/convertible_power_button_controller_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/power_event_observer_test_api.cc", + "system/power/power_event_observer_test_api.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", @@ -1810,10 +1865,6 @@ static_library("test_support_common") { "test/ash_test_suite.h", "test/ash_test_views_delegate.cc", "test/ash_test_views_delegate.h", - - # TODO(jamescook): Rename to TestChildModalWindow and move to //ash/wm - "test/child_modal_window.cc", - "test/child_modal_window.h", "test/ui_controls_factory_ash.cc", "test/ui_controls_factory_ash.h", "test_media_client.cc", @@ -1822,8 +1873,6 @@ static_library("test_support_common") { "test_screenshot_delegate.h", "test_shell_delegate.cc", "test_shell_delegate.h", - "wallpaper/test_wallpaper_delegate.cc", - "wallpaper/test_wallpaper_delegate.h", "wallpaper/wallpaper_controller_test_api.cc", "wallpaper/wallpaper_controller_test_api.h", "wm/cursor_manager_test_api.cc", @@ -1832,6 +1881,8 @@ static_library("test_support_common") { "wm/lock_state_controller_test_api.h", "wm/test_activation_delegate.cc", "wm/test_activation_delegate.h", + "wm/test_child_modal_parent.cc", + "wm/test_child_modal_parent.h", "wm/test_overlay_delegate.cc", "wm/test_overlay_delegate.h", "wm/test_session_state_animator.cc", @@ -1956,6 +2007,7 @@ service_manifest("manifest") { repack("ash_service_resources") { output = "$root_out_dir/ash_service_resources.pak" sources = [ + "$root_gen_dir/ash/components/resources/ash_components_resources_100_percent.pak", "$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", @@ -1966,6 +2018,7 @@ repack("ash_service_resources") { "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", ] deps = [ + "//ash/components/resources", "//ash/resources", "//ash/strings", "//ui/chromeos/resources", @@ -1980,12 +2033,14 @@ repack("ash_service_resources") { repack("ash_service_resources_200") { output = "$root_out_dir/ash_service_resources_200.pak" sources = [ + "$root_gen_dir/ash/components/resources/ash_components_resources_200_percent.pak", "$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/components/resources", "//ash/resources", "//ui/chromeos/resources", "//ui/resources", @@ -2008,11 +2063,11 @@ source_set("mash_unittests") { ":ash_service_resources", "//ash", "//ash:test_support_without_content", + "//ash/components/quick_launch/public/mojom:constants", "//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", @@ -2039,7 +2094,7 @@ source_set("mash_unittests") { data_deps = [ ":ash_service", - "//mash/quick_launch", + "//ash/components/quick_launch:quick_launch_app", "//services/ui/ime/test_ime_driver", ] } |