diff options
Diffstat (limited to 'chromium/ash')
30 files changed, 665 insertions, 285 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index aac61e47b0b..8ef7018a893 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -62,6 +62,9 @@ component("ash") { "accessibility/accessibility_highlight_layer.h", "accessibility/accessibility_layer.cc", "accessibility/accessibility_layer.h", + "accessibility/accessibility_observer.h", + "accessibility/accessibility_panel_layout_manager.cc", + "accessibility/accessibility_panel_layout_manager.h", "accessibility/default_accessibility_delegate.cc", "accessibility/default_accessibility_delegate.h", "accessibility/focus_ring_controller.cc", @@ -72,15 +75,17 @@ component("ash") { "accessibility/touch_accessibility_enabler.h", "accessibility/touch_exploration_controller.cc", "accessibility/touch_exploration_controller.h", + "accessibility/touch_exploration_manager.cc", + "accessibility/touch_exploration_manager.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_presenter_impl.cc", + "app_list/app_list_presenter_impl.h", "app_list/app_list_view_delegate_mash.cc", "app_list/app_list_view_delegate_mash.h", "ash_constants.cc", @@ -88,9 +93,11 @@ component("ash") { "ash_export.h", "ash_layout_constants.cc", "ash_layout_constants.h", - "ash_touch_exploration_manager_chromeos.cc", - "ash_touch_exploration_manager_chromeos.h", "ash_view_ids.h", + "assistant/ash_assistant_controller.cc", + "assistant/ash_assistant_controller.h", + "assistant/model/assistant_interaction_model_impl.cc", + "assistant/model/assistant_interaction_model_impl.h", "autoclick/autoclick_controller.cc", "autoclick/autoclick_controller.h", "cancel_mode.cc", @@ -99,21 +106,26 @@ component("ash") { "cast_config_controller.h", "debug.cc", "debug.h", + "detachable_base/detachable_base_handler.cc", + "detachable_base/detachable_base_handler.h", + "detachable_base/detachable_base_notification_controller.cc", + "detachable_base/detachable_base_notification_controller.h", + "detachable_base/detachable_base_observer.h", + "detachable_base/detachable_base_pairing_status.h", "disconnected_app_handler.cc", "disconnected_app_handler.h", "display/ash_display_controller.cc", "display/ash_display_controller.h", "display/cursor_window_controller.cc", "display/cursor_window_controller.h", + "display/display_animator.cc", "display/display_animator.h", - "display/display_animator_chromeos.cc", - "display/display_animator_chromeos.h", - "display/display_color_manager_chromeos.cc", - "display/display_color_manager_chromeos.h", + "display/display_color_manager.cc", + "display/display_color_manager.h", "display/display_configuration_controller.cc", "display/display_configuration_controller.h", - "display/display_error_observer_chromeos.cc", - "display/display_error_observer_chromeos.h", + "display/display_error_observer.cc", + "display/display_error_observer.h", "display/display_move_window_util.cc", "display/display_move_window_util.h", "display/display_shutdown_observer.cc", @@ -139,16 +151,16 @@ component("ash") { "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/projecting_observer.cc", + "display/projecting_observer.h", "display/resolution_notification_controller.cc", "display/resolution_notification_controller.h", "display/root_window_transformers.cc", "display/root_window_transformers.h", "display/screen_ash.cc", "display/screen_ash.h", - "display/screen_orientation_controller_chromeos.cc", - "display/screen_orientation_controller_chromeos.h", + "display/screen_orientation_controller.cc", + "display/screen_orientation_controller.h", "display/screen_position_controller.cc", "display/screen_position_controller.h", "display/shared_display_edge_indicator.cc", @@ -169,18 +181,10 @@ component("ash") { "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", - "fast_ink/fast_ink_points.h", - "fast_ink/fast_ink_view.cc", - "fast_ink/fast_ink_view.h", "first_run/desktop_cleaner.cc", "first_run/desktop_cleaner.h", "first_run/first_run_helper.cc", "first_run/first_run_helper.h", - "first_run/first_run_helper_impl.cc", - "first_run/first_run_helper_impl.h", "focus_cycler.cc", "focus_cycler.h", "frame/caption_buttons/caption_button_types.h", @@ -202,10 +206,14 @@ component("ash") { "frame/frame_border_hit_test.cc", "frame/frame_border_hit_test.h", "frame/frame_header.h", + "frame/frame_header_origin_text.cc", + "frame/frame_header_origin_text.h", "frame/frame_header_util.cc", "frame/frame_header_util.h", "frame/header_view.cc", "frame/header_view.h", + "frame/wide_frame_view.cc", + "frame/wide_frame_view.h", "high_contrast/high_contrast_controller.cc", "high_contrast/high_contrast_controller.h", "highlighter/highlighter_controller.cc", @@ -265,12 +273,15 @@ component("ash") { "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/login_screen_controller.cc", "login/login_screen_controller.h", + "login/login_screen_controller_observer.cc", + "login/login_screen_controller_observer.h", "login/ui/animated_rounded_image_view.cc", "login/ui/animated_rounded_image_view.h", "login/ui/animation_frame.h", + "login/ui/arrow_button_view.cc", + "login/ui/arrow_button_view.h", "login/ui/hover_notifier.cc", "login/ui/hover_notifier.h", "login/ui/image_parser.cc", @@ -289,16 +300,24 @@ component("ash") { "login/ui/login_auth_user_view.h", "login/ui/login_base_bubble_view.cc", "login/ui/login_base_bubble_view.h", + "login/ui/login_big_user_view.cc", + "login/ui/login_big_user_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_data_dispatcher.cc", "login/ui/login_data_dispatcher.h", + "login/ui/login_detachable_base_model.cc", + "login/ui/login_detachable_base_model.h", + "login/ui/login_expanded_public_account_view.cc", + "login/ui/login_expanded_public_account_view.h", "login/ui/login_password_view.cc", "login/ui/login_password_view.h", "login/ui/login_pin_view.cc", "login/ui/login_pin_view.h", + "login/ui/login_public_account_user_view.cc", + "login/ui/login_public_account_user_view.h", "login/ui/login_user_view.cc", "login/ui/login_user_view.h", "login/ui/non_accessible_view.cc", @@ -354,6 +373,8 @@ component("ash") { "metrics/user_metrics_recorder.h", "mojo_interface_factory.cc", "mojo_interface_factory.h", + "multi_device_setup/multi_device_notification_presenter.cc", + "multi_device_setup/multi_device_notification_presenter.h", "multi_profile_uma.cc", "multi_profile_uma.h", "network_connect_delegate_mus.cc", @@ -384,6 +405,8 @@ component("ash") { "session/multiprofiles_intro_dialog.h", "session/session_aborted_dialog.cc", "session/session_aborted_dialog.h", + "session/session_activation_observer_holder.cc", + "session/session_activation_observer_holder.h", "session/session_controller.cc", "session/session_controller.h", "session/session_observer.cc", @@ -472,13 +495,18 @@ component("ash") { "sticky_keys/sticky_keys_overlay.cc", "sticky_keys/sticky_keys_overlay.h", "sticky_keys/sticky_keys_state.h", - "system/accessibility_observer.h", "system/audio/audio_detailed_view.cc", "system/audio/audio_detailed_view.h", "system/audio/tray_audio.cc", "system/audio/tray_audio.h", + "system/audio/unified_volume_slider_controller.cc", + "system/audio/unified_volume_slider_controller.h", + "system/audio/unified_volume_view.cc", + "system/audio/unified_volume_view.h", "system/audio/volume_view.cc", "system/audio/volume_view.h", + "system/bluetooth/bluetooth_feature_pod_controller.cc", + "system/bluetooth/bluetooth_feature_pod_controller.h", "system/bluetooth/bluetooth_notification_controller.cc", "system/bluetooth/bluetooth_notification_controller.h", "system/bluetooth/bluetooth_observer.h", @@ -492,7 +520,13 @@ component("ash") { "system/brightness/brightness_controller_chromeos.h", "system/brightness/tray_brightness.cc", "system/brightness/tray_brightness.h", + "system/brightness/unified_brightness_slider_controller.cc", + "system/brightness/unified_brightness_slider_controller.h", + "system/brightness/unified_brightness_view.cc", + "system/brightness/unified_brightness_view.h", "system/brightness_control_delegate.h", + "system/caps_lock_notification_controller.cc", + "system/caps_lock_notification_controller.h", "system/cast/tray_cast.cc", "system/cast/tray_cast.h", "system/date/clock_observer.h", @@ -513,6 +547,8 @@ component("ash") { "system/enterprise/tray_enterprise.h", "system/flag_warning/flag_warning_tray.cc", "system/flag_warning/flag_warning_tray.h", + "system/ime/ime_feature_pod_controller.cc", + "system/ime/ime_feature_pod_controller.h", "system/ime/ime_observer.h", "system/ime/tray_ime_chromeos.cc", "system/ime/tray_ime_chromeos.h", @@ -529,6 +565,20 @@ component("ash") { "system/locale/locale_notification_controller.h", "system/media_security/multi_profile_media_tray_item.cc", "system/media_security/multi_profile_media_tray_item.h", + "system/model/clock_model.cc", + "system/model/clock_model.h", + "system/model/enterprise_domain_model.cc", + "system/model/enterprise_domain_model.h", + "system/model/system_tray_model.cc", + "system/model/system_tray_model.h", + "system/model/tracing_model.cc", + "system/model/tracing_model.h", + "system/model/update_model.cc", + "system/model/update_model.h", + "system/network/network_feature_pod_button.cc", + "system/network/network_feature_pod_button.h", + "system/network/network_feature_pod_controller.cc", + "system/network/network_feature_pod_controller.h", "system/network/network_icon.cc", "system/network/network_icon.h", "system/network/network_icon_animation.cc", @@ -552,6 +602,8 @@ component("ash") { "system/network/tray_network_state_observer.h", "system/network/tray_vpn.cc", "system/network/tray_vpn.h", + "system/network/vpn_feature_pod_controller.cc", + "system/network/vpn_feature_pod_controller.h", "system/network/vpn_list.cc", "system/network/vpn_list.h", "system/network/vpn_list_view.cc", @@ -560,6 +612,8 @@ component("ash") { "system/networking_config_delegate.h", "system/night_light/night_light_controller.cc", "system/night_light/night_light_controller.h", + "system/night_light/night_light_feature_pod_controller.cc", + "system/night_light/night_light_feature_pod_controller.h", "system/night_light/night_light_toggle_button.cc", "system/night_light/night_light_toggle_button.h", "system/night_light/time_of_day.cc", @@ -616,18 +670,20 @@ component("ash") { "system/power/power_button_screenshot_controller.h", "system/power/power_event_observer.cc", "system/power/power_event_observer.h", + "system/power/power_prefs.cc", + "system/power/power_prefs.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", "system/power/tray_power.h", "system/power/video_activity_notifier.cc", "system/power/video_activity_notifier.h", + "system/rotation/rotation_lock_feature_pod_controller.cc", + "system/rotation/rotation_lock_feature_pod_controller.h", "system/rotation/tray_rotation_lock.cc", "system/rotation/tray_rotation_lock.h", "system/screen_layout_observer.cc", @@ -635,6 +691,8 @@ component("ash") { "system/screen_security/screen_capture_observer.h", "system/screen_security/screen_capture_tray_item.cc", "system/screen_security/screen_capture_tray_item.h", + "system/screen_security/screen_security_notification_controller.cc", + "system/screen_security/screen_security_notification_controller.h", "system/screen_security/screen_share_observer.h", "system/screen_security/screen_share_tray_item.cc", "system/screen_security/screen_share_tray_item.h", @@ -656,8 +714,6 @@ component("ash") { "system/status_area_widget_delegate.h", "system/supervised/tray_supervised_user.cc", "system/supervised/tray_supervised_user.h", - "system/system_clock_observer.cc", - "system/system_clock_observer.h", "system/system_tray_focus_observer.h", "system/tiles/tiles_default_view.cc", "system/tiles/tiles_default_view.h", @@ -729,16 +785,38 @@ component("ash") { "system/tray_drag_controller.h", "system/tray_tracing.cc", "system/tray_tracing.h", + "system/unified/accessibility_feature_pod_controller.cc", + "system/unified/accessibility_feature_pod_controller.h", + "system/unified/collapse_button.cc", + "system/unified/collapse_button.h", + "system/unified/feature_pod_button.cc", + "system/unified/feature_pod_button.h", + "system/unified/feature_pod_controller_base.cc", + "system/unified/feature_pod_controller_base.h", + "system/unified/feature_pods_container_view.cc", + "system/unified/feature_pods_container_view.h", + "system/unified/quiet_mode_feature_pod_controller.cc", + "system/unified/quiet_mode_feature_pod_controller.h", + "system/unified/sign_out_button.cc", + "system/unified/sign_out_button.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_message_center_view.cc", + "system/unified/unified_message_center_view.h", + "system/unified/unified_slider_view.cc", + "system/unified/unified_slider_view.h", + "system/unified/unified_system_info_view.cc", + "system/unified/unified_system_info_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_model.cc", + "system/unified/unified_system_tray_model.h", "system/unified/unified_system_tray_view.cc", "system/unified/unified_system_tray_view.h", "system/update/tray_update.cc", @@ -799,8 +877,16 @@ component("ash") { "wallpaper/wallpaper_controller.cc", "wallpaper/wallpaper_controller.h", "wallpaper/wallpaper_controller_observer.h", - "wallpaper/wallpaper_decoder.cc", - "wallpaper/wallpaper_decoder.h", + "wallpaper/wallpaper_info.h", + "wallpaper/wallpaper_utils/wallpaper_color_calculator.cc", + "wallpaper/wallpaper_utils/wallpaper_color_calculator.h", + "wallpaper/wallpaper_utils/wallpaper_color_calculator_observer.h", + "wallpaper/wallpaper_utils/wallpaper_color_extraction_result.h", + "wallpaper/wallpaper_utils/wallpaper_decoder.cc", + "wallpaper/wallpaper_utils/wallpaper_decoder.h", + "wallpaper/wallpaper_utils/wallpaper_resizer.cc", + "wallpaper/wallpaper_utils/wallpaper_resizer.h", + "wallpaper/wallpaper_utils/wallpaper_resizer_observer.h", "wallpaper/wallpaper_view.cc", "wallpaper/wallpaper_view.h", "wallpaper/wallpaper_widget_controller.cc", @@ -937,8 +1023,8 @@ component("ash") { "wm/splitview/split_view_controller.h", "wm/splitview/split_view_divider.cc", "wm/splitview/split_view_divider.h", - "wm/splitview/split_view_overview_overlay.cc", - "wm/splitview/split_view_overview_overlay.h", + "wm/splitview/split_view_drag_indicators.cc", + "wm/splitview/split_view_drag_indicators.h", "wm/splitview/split_view_utils.cc", "wm/splitview/split_view_utils.h", "wm/stacking_controller.cc", @@ -1060,8 +1146,8 @@ component("ash") { "//ash/strings", "//ash/wayland", "//mash/public/mojom", - "//mojo/common:common_base", "//mojo/common:values_struct_traits", + "//mojo/public/cpp/system", "//services/ui/common:mus_common", "//services/ui/public/cpp", "//services/ui/public/cpp/input_devices", @@ -1082,6 +1168,8 @@ component("ash") { deps = [ "//ash/autoclick/common:autoclick", "//ash/components/autoclick/public/mojom", + "//ash/components/cursor", + "//ash/components/fast_ink", "//ash/components/quick_launch/public/mojom", "//ash/touch_hud", "//base", @@ -1092,6 +1180,9 @@ component("ash") { "//cc/paint:paint", "//chromeos", "//chromeos:power_manager_proto", + "//chromeos/components/proximity_auth/logging", + "//chromeos/services/assistant/public/mojom", + "//chromeos/services/multidevice_setup/public/mojom", "//components/device_event_log", "//components/exo", "//components/exo/wayland", @@ -1108,7 +1199,6 @@ component("ash") { "//components/vector_icons", "//components/viz/host", "//components/viz/service", - "//components/wallpaper", "//device/bluetooth", "//extensions/common:common_constants", "//gpu/command_buffer/client", @@ -1121,12 +1211,12 @@ component("ash") { "//services/ui/public/interfaces/input_devices", # TODO(msw): Remove this; only ash_with_content should depend on webkit. - "//third_party/WebKit/public:blink_headers", + "//ash/app_list/presenter", + "//third_party/blink/public:blink_headers", "//third_party/icu", "//third_party/qcms", "//third_party/re2", "//ui/accessibility", - "//ui/app_list/presenter", "//ui/base", "//ui/base:ui_data_pack", "//ui/base/ime", @@ -1135,6 +1225,7 @@ component("ash") { "//ui/chromeos/resources", "//ui/chromeos/strings", "//ui/compositor", + "//ui/compositor_extra", "//ui/display", "//ui/display/manager", "//ui/display/types", @@ -1205,7 +1296,7 @@ component("ash_with_content") { "//ui/events", "//ui/gfx", "//ui/gfx/geometry", - "//ui/keyboard:keyboard_with_content", + "//ui/keyboard", "//ui/resources", "//ui/strings", "//ui/views", @@ -1221,8 +1312,6 @@ static_library("ash_shell_lib") { "../ui/views/test/test_views_delegate_aura.cc", "shell/app_list.cc", "shell/bubble.cc", - "shell/example_app_list_presenter.cc", - "shell/example_app_list_presenter.h", "shell/example_factory.h", "shell/example_session_controller_client.cc", "shell/example_session_controller_client.h", @@ -1253,13 +1342,13 @@ static_library("ash_shell_lib") { deps = [ ":ash", ":test_support_without_content", + "//ash/app_list/presenter", + "//ash/app_list/presenter:test_support", "//ash/public/cpp", "//base", "//base:i18n", "//components/user_manager", "//skia", - "//ui/app_list/presenter", - "//ui/app_list/presenter:test_support", "//ui/aura", "//ui/base", "//ui/gfx", @@ -1289,6 +1378,7 @@ static_library("ash_shell_lib_with_content") { ":ash_shell_lib", ":ash_with_content", ":test_support_without_content", + "//ash/app_list/presenter:test_support", "//ash/public/cpp", "//base:i18n", "//chrome:packed_resources", @@ -1298,7 +1388,6 @@ static_library("ash_shell_lib_with_content") { "//device/bluetooth", "//net", "//skia", - "//ui/app_list/presenter:test_support", "//ui/aura", "//ui/base", "//ui/base/ime", @@ -1342,7 +1431,7 @@ test("ash_content_unittests") { "//content/public/browser", "//content/test:test_support", "//device/bluetooth", - "//mojo/edk/system", + "//mojo/edk", "//net", "//skia", "//testing/gtest", @@ -1379,16 +1468,21 @@ test("ash_unittests") { "accessibility/accessibility_controller_unittest.cc", "accessibility/accessibility_focus_ring_controller_unittest.cc", "accessibility/accessibility_highlight_controller_unittest.cc", + "accessibility/accessibility_panel_layout_manager_unittest.cc", "accessibility/touch_accessibility_enabler_unittest.cc", "accessibility/touch_exploration_controller_unittest.cc", + "accessibility/touch_exploration_manager_unittest.cc", "app_list/app_list_presenter_delegate_unittest.cc", - "ash_touch_exploration_manager_chromeos_unittest.cc", + "app_list/model/app_list_item_list_unittest.cc", + "app_list/model/app_list_model_unittest.cc", "autoclick/autoclick_unittest.cc", + "detachable_base/detachable_base_handler_unittest.cc", + "detachable_base/detachable_base_notification_controller_unittest.cc", "dip_unittest.cc", "display/cursor_window_controller_unittest.cc", - "display/display_color_manager_chromeos_unittest.cc", + "display/display_color_manager_unittest.cc", "display/display_configuration_controller_unittest.cc", - "display/display_error_observer_chromeos_unittest.cc", + "display/display_error_observer_unittest.cc", "display/display_manager_unittest.cc", "display/display_move_window_util_unittest.cc", "display/display_util_unittest.cc", @@ -1396,7 +1490,7 @@ test("ash_unittests") { "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/projecting_observer_unittest.cc", "display/resolution_notification_controller_unittest.cc", "display/root_window_transformers_unittest.cc", "display/screen_ash_unittest.cc", @@ -1408,10 +1502,10 @@ test("ash_unittests") { "drag_drop/drag_drop_tracker_unittest.cc", "drag_drop/drag_image_view_unittest.cc", "extended_desktop_unittest.cc", - "fast_ink/fast_ink_points_unittest.cc", "first_run/first_run_helper_unittest.cc", "focus_cycler_unittest.cc", "frame/caption_buttons/frame_caption_button_container_view_unittest.cc", + "frame/caption_buttons/frame_caption_button_unittest.cc", "frame/caption_buttons/frame_size_button_unittest.cc", "frame/custom_frame_view_ash_unittest.cc", "frame/default_frame_header_unittest.cc", @@ -1426,11 +1520,14 @@ test("ash_unittests") { "login/login_screen_controller_unittest.cc", "login/mock_login_screen_client.cc", "login/mock_login_screen_client.h", + "login/ui/fake_login_detachable_base_model.cc", + "login/ui/fake_login_detachable_base_model.h", "login/ui/lock_contents_view_unittest.cc", "login/ui/lock_screen_sanity_unittest.cc", "login/ui/lock_window_unittest.cc", "login/ui/login_auth_user_view_unittest.cc", "login/ui/login_bubble_unittest.cc", + "login/ui/login_expanded_public_account_view_unittest.cc", "login/ui/login_keyboard_test_base.cc", "login/ui/login_keyboard_test_base.h", "login/ui/login_password_view_test.cc", @@ -1456,6 +1553,7 @@ test("ash_unittests") { "metrics/task_switch_metrics_recorder_unittest.cc", "metrics/task_switch_time_tracker_unittest.cc", "metrics/user_metrics_recorder_unittest.cc", + "multi_device_setup/multi_device_notification_presenter_unittest.cc", "mus_property_mirror_ash_unittest.cc", "pointer_watcher_adapter_classic_unittest.cc", "root_window_controller_unittest.cc", @@ -1485,6 +1583,7 @@ test("ash_unittests") { "system/bluetooth/bluetooth_power_controller_unittest.cc", "system/bluetooth/tray_bluetooth_helper_unittest.cc", "system/brightness/tray_brightness_unittest.cc", + "system/caps_lock_notification_controller_unittest.cc", "system/date/date_view_unittest.cc", "system/date/system_info_default_view_unittest.cc", "system/enterprise/tray_enterprise_unittest.cc", @@ -1511,15 +1610,18 @@ test("ash_unittests") { "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_controller_unittest.cc", "system/power/power_button_screenshot_controller_unittest.cc", "system/power/power_event_observer_unittest.cc", + "system/power/power_prefs_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/rotation_lock_feature_pod_controller_unittest.cc", "system/rotation/tray_rotation_lock_unittest.cc", "system/screen_layout_observer_unittest.cc", + "system/screen_security/screen_security_notification_controller_unittest.cc", "system/screen_security/screen_tray_item_unittest.cc", "system/session/logout_button_tray_unittest.cc", "system/session/logout_confirmation_controller_unittest.cc", @@ -1537,6 +1639,10 @@ test("ash_unittests") { "system/tray_accessibility_unittest.cc", "system/tray_caps_lock_unittest.cc", "system/tray_tracing_unittest.cc", + "system/unified/accessibility_feature_pod_controller_unittest.cc", + "system/unified/feature_pods_container_view_unittest.cc", + "system/unified/top_shortcuts_view_unittest.cc", + "system/unified/unified_system_info_view_unittest.cc", "system/update/tray_update_unittest.cc", "system/user/tray_user_unittest.cc", "system/web_notification/ash_popup_alignment_delegate_unittest.cc", @@ -1555,6 +1661,9 @@ test("ash_unittests") { "virtual_keyboard_controller_unittest.cc", "voice_interaction/voice_interaction_controller_unittest.cc", "wallpaper/wallpaper_controller_unittest.cc", + "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc", + "wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc", + "wallpaper/wallpaper_window_state_manager_unittest.cc", "window_manager_common_unittests.cc", "window_user_data_unittest.cc", "wm/always_on_top_controller_unittest.cc", @@ -1611,7 +1720,11 @@ test("ash_unittests") { deps = [ ":ash", ":test_support_without_content", + "//ash/app_list/presenter", + "//ash/app_list/presenter:test_support", "//ash/autoclick/common:autoclick", + "//ash/components/fast_ink", + "//ash/components/fast_ink:unit_tests", "//ash/components/shortcut_viewer:ksv_unittests", "//ash/public/cpp", "//ash/public/cpp:unit_tests", @@ -1633,7 +1746,7 @@ test("ash_unittests") { "//components/user_manager", "//components/user_manager:test_support", "//device/bluetooth", - "//mojo/edk/system", + "//mojo/edk", "//net:net", "//services/ui/public/cpp/input_devices:test_support", "//services/ui/public/interfaces", @@ -1643,8 +1756,6 @@ test("ash_unittests") { "//third_party/icu", "//ui/accessibility", "//ui/app_list:test_support", - "//ui/app_list/presenter", - "//ui/app_list/presenter:test_support", "//ui/aura", "//ui/aura:test_support", "//ui/base", @@ -1709,7 +1820,7 @@ test("ash_perftests") { "//ash/public/cpp", "//base/test:test_support", "//cc/base", - "//mojo/edk/embedder:headers", + "//mojo/edk", "//testing/gtest", "//testing/perf", "//ui/aura", @@ -1788,8 +1899,10 @@ static_library("test_support_common") { sources = [ "accessibility/test_accessibility_controller_client.cc", "accessibility/test_accessibility_controller_client.h", - "app_list/test_app_list_presenter_impl.cc", - "app_list/test_app_list_presenter_impl.h", + "app_list/test/app_list_test_helper.cc", + "app_list/test/app_list_test_helper.h", + "app_list/test/test_app_list_client.cc", + "app_list/test/test_app_list_client.h", "display/display_configuration_controller_test_api.cc", "display/display_configuration_controller_test_api.h", "display/mirror_window_test_api.cc", @@ -1800,6 +1913,8 @@ static_library("test_support_common") { "highlighter/highlighter_controller_test_api.h", "ime/test_ime_controller.cc", "ime/test_ime_controller.h", + "ime/test_ime_controller_client.cc", + "ime/test_ime_controller_client.h", "keyboard/test_keyboard_ui.cc", "keyboard/test_keyboard_ui.h", "laser/laser_pointer_controller_test_api.cc", @@ -1842,14 +1957,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/power_button_controller_test_api.cc", + "system/power/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", @@ -1897,11 +2012,14 @@ static_library("test_support_common") { public_deps = [ "//ash", "//testing/gtest", - "//third_party/WebKit/public:blink_headers", + "//third_party/blink/public:blink_headers", "//ui/display:display_manager_test_api", ] deps = [ "//ash", + "//ash/app_list/presenter", + "//ash/app_list/presenter:test_support", + "//ash/components/fast_ink", "//ash/public/cpp", "//ash/public/interfaces:test_interfaces", "//ash/resources", @@ -1923,8 +2041,6 @@ static_library("test_support_common") { "//testing/gtest", "//ui/accessibility", "//ui/app_list:test_support", - "//ui/app_list/presenter", - "//ui/app_list/presenter:test_support", "//ui/aura", "//ui/aura:test_support", "//ui/base:test_support", diff --git a/chromium/ash/app_list/presenter/BUILD.gn b/chromium/ash/app_list/presenter/BUILD.gn new file mode 100644 index 00000000000..4cc1d56f78b --- /dev/null +++ b/chromium/ash/app_list/presenter/BUILD.gn @@ -0,0 +1,91 @@ +# Copyright 2016 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") +import("//testing/test.gni") + +assert(use_aura) + +component("presenter") { + sources = [ + "app_list_delegate.h", + "app_list_presenter_delegate.cc", + "app_list_presenter_delegate.h", + "app_list_presenter_delegate_factory.h", + "app_list_presenter_export.h", + "app_list_view_delegate_factory.cc", + "app_list_view_delegate_factory.h", + ] + + defines = [ "APP_LIST_PRESENTER_IMPLEMENTATION" ] + + public_deps = [ + "//base", + "//mojo/public/cpp/bindings", + "//ui/app_list", + "//ui/aura", + "//ui/compositor", + "//ui/gfx/geometry", + "//ui/views", + + # Temporary dependency to fix compile flake in http://crbug.com/611898. + # TODO(tapted): Remove once http://crbug.com/612382 is fixed. + "//ui/accessibility:ax_enums_mojo", + ] +} + +static_library("test_support") { + sources = [ + "test/app_list_presenter_impl_test_api.cc", + "test/app_list_presenter_impl_test_api.h", + + # Temporary dependency to fix compile flake in http://crbug.com/611898. + # TODO(tapted): Remove once http://crbug.com/612382 is fixed. + "//ui/accessibility:ax_enums_mojo", + ] + + public_deps = [ + ":presenter", + ] + deps = [ + "//ash", + "//base", + "//mojo/public/cpp/bindings", + "//ui/app_list:test_support", + ] +} + +test("app_list_presenter_unittests") { + sources = [ + "app_list_presenter_impl_unittest.cc", + "test/run_all_unittests.cc", + ] + + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + + deps = [ + ":presenter", + ":test_support", + "//ash:ash", + "//base", + "//base/test:test_support", + "//mojo/edk", + "//testing/gtest", + "//ui/app_list:test_support", + "//ui/aura:aura", + "//ui/aura:test_support", + "//ui/base", + "//ui/gl:test_support", + "//ui/views:test_support", + "//ui/wm:wm", + + # Temporary dependency to fix compile flake in http://crbug.com/611898. + # TODO(tapted): Remove once http://crbug.com/612382 is fixed. + "//ui/accessibility:ax_enums_mojo", + ] + + data_deps = [ + "//ui/resources:ui_test_pak_data", + ] +} diff --git a/chromium/ash/components/cursor/BUILD.gn b/chromium/ash/components/cursor/BUILD.gn new file mode 100644 index 00000000000..8184365572b --- /dev/null +++ b/chromium/ash/components/cursor/BUILD.gn @@ -0,0 +1,23 @@ +# Copyright 2018 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. + +source_set("cursor") { + sources = [ + "cursor_view.cc", + "cursor_view.h", + ] + + deps = [ + "//ash/components/fast_ink", + "//base", + "//cc", + "//components/viz/common", + "//skia", + "//ui/aura", + "//ui/events", + "//ui/events/ozone:events_ozone", + "//ui/gfx", + "//ui/views:views", + ] +} diff --git a/chromium/ash/components/fast_ink/BUILD.gn b/chromium/ash/components/fast_ink/BUILD.gn new file mode 100644 index 00000000000..9aee9665be5 --- /dev/null +++ b/chromium/ash/components/fast_ink/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright 2018 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. + +source_set("fast_ink") { + sources = [ + "fast_ink_pointer_controller.cc", + "fast_ink_pointer_controller.h", + "fast_ink_points.cc", + "fast_ink_points.h", + "fast_ink_view.cc", + "fast_ink_view.h", + ] + + deps = [ + "//base", + "//cc", + "//components/viz/service", + "//gpu", + "//gpu/command_buffer/client:gles2_interface", + "//services/ui/public/interfaces", + "//skia", + "//ui/aura", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gl", + "//ui/views:views", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "fast_ink_points_unittest.cc", + ] + + deps = [ + ":fast_ink", + "//testing/gtest", + "//ui/events:test_support", + ] +} diff --git a/chromium/ash/components/shortcut_viewer/BUILD.gn b/chromium/ash/components/shortcut_viewer/BUILD.gn index c51c79ad1db..d53553d658c 100644 --- a/chromium/ash/components/shortcut_viewer/BUILD.gn +++ b/chromium/ash/components/shortcut_viewer/BUILD.gn @@ -30,6 +30,7 @@ source_set("ksv") { "//ash/components/shortcut_viewer/vector_icons", "//ash/components/strings", "//ash/public/cpp", + "//ash/resources", "//cc/paint", "//ui/accessibility", "//ui/aura", @@ -50,6 +51,7 @@ source_set("ksv_unittests") { ":ksv", "//ash:test_support_without_content", "//testing/gtest", + "//ui/events:test_support", "//ui/views", ] } diff --git a/chromium/ash/components/shortcut_viewer/vector_icons/BUILD.gn b/chromium/ash/components/shortcut_viewer/vector_icons/BUILD.gn index 06735ca00f7..36b5a990801 100644 --- a/chromium/ash/components/shortcut_viewer/vector_icons/BUILD.gn +++ b/chromium/ash/components/shortcut_viewer/vector_icons/BUILD.gn @@ -8,43 +8,24 @@ aggregate_vector_icons("ksv_vector_icons") { icon_directory = "." icons = [ - "ksv_search_back.1x.icon", "ksv_search_back.icon", - "ksv_search_bar.1x.icon", "ksv_search_bar.icon", - "ksv_search_close.1x.icon", "ksv_search_close.icon", - "ksv_search_no_result.1x.icon", "ksv_search_no_result.icon", - "ksv_separator_plus.1x.icon", "ksv_separator_plus.icon", - "ksv_arrow_down.1x.icon", "ksv_arrow_down.icon", - "ksv_arrow_left.1x.icon", "ksv_arrow_left.icon", - "ksv_arrow_right.1x.icon", "ksv_arrow_right.icon", - "ksv_arrow_up.1x.icon", "ksv_arrow_up.icon", - "ksv_brightness_down.1x.icon", "ksv_brightness_down.icon", - "ksv_brightness_up.1x.icon", "ksv_brightness_up.icon", - "ksv_browser_back.1x.icon", "ksv_browser_back.icon", - "ksv_browser_forward.1x.icon", "ksv_browser_forward.icon", - "ksv_fullscreen.1x.icon", "ksv_fullscreen.icon", - "ksv_mute.1x.icon", "ksv_mute.icon", - "ksv_overview.1x.icon", "ksv_overview.icon", - "ksv_reload.1x.icon", "ksv_reload.icon", - "ksv_volume_down.1x.icon", "ksv_volume_down.icon", - "ksv_volume_up.1x.icon", "ksv_volume_up.icon", ] } diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 3b8e588bbaf..54cb30fe648 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -7,8 +7,12 @@ import("//mojo/public/tools/bindings/mojom.gni") # C++ headers and sources that can be used outside ash. component("cpp") { sources = [ + "accelerators.cc", + "accelerators.h", "accessibility_types.h", + "app_list/app_list_types.cc", "app_list/app_list_types.h", + "app_list/internal_app_id_constants.h", "app_list/term_break_iterator.cc", "app_list/term_break_iterator.h", "app_list/tokenized_string.cc", @@ -64,6 +68,7 @@ component("cpp") { "shell_window_ids.h", "stylus_utils.cc", "stylus_utils.h", + "wallpaper_types.h", "window_pin_type.cc", "window_pin_type.h", "window_properties.cc", diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn index e1a8240b616..7d77428e9b2 100644 --- a/chromium/ash/public/cpp/vector_icons/BUILD.gn +++ b/chromium/ash/public/cpp/vector_icons/BUILD.gn @@ -10,35 +10,30 @@ aggregate_vector_icons("ash_public_vector_icons") { icons = [ "notification_captive_portal.icon", - "notification_cellular_alert.1x.icon", "notification_cellular_alert.icon", + "notification_download.icon", + "notification_end_of_support.icon", "notification_google.icon", "notification_image.icon", "notification_installed.icon", "notification_mobile_data.icon", "notification_mobile_data_off.icon", + "notification_multi_device_setup.icon", "notification_play_prism.icon", "notification_printing.icon", "notification_printing_done.icon", "notification_printing_warning.icon", + "notification_settings.icon", "notification_storage_full.icon", "notification_vpn.icon", "notification_warning.icon", "notification_wifi_off.icon", - "notification_download.icon", - "notification_end_of_support.icon", - "window_control_left_snapped.1x.icon", - "window_control_left_snapped.icon", - "window_control_right_snapped.1x.icon", - "window_control_right_snapped.icon", - "window_control_close.1x.icon", "window_control_close.icon", - "window_control_maximize.1x.icon", + "window_control_left_snapped.icon", "window_control_maximize.icon", - "window_control_minimize.1x.icon", "window_control_minimize.icon", - "window_control_restore.1x.icon", "window_control_restore.icon", + "window_control_right_snapped.icon", ] } diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn index 4c1c82a8082..d4ab8f926ca 100644 --- a/chromium/ash/public/interfaces/BUILD.gn +++ b/chromium/ash/public/interfaces/BUILD.gn @@ -14,7 +14,9 @@ mojom("interfaces_internal") { sources = [ "accelerator_controller.mojom", "accessibility_controller.mojom", + "accessibility_focus_ring_controller.mojom", "app_list.mojom", + "ash_assistant_controller.mojom", "ash_display_controller.mojom", "ash_message_center_controller.mojom", "cast_config.mojom", @@ -55,16 +57,23 @@ mojom("interfaces_internal") { ] public_deps = [ + "//chromeos/components/proximity_auth/public/interfaces", + "//chromeos/services/assistant/public/mojom", "//components/password_manager/public/interfaces", - "//components/proximity_auth/public/interfaces", "//components/signin/public/interfaces", "//components/sync/mojo:interfaces", "//mojo/common:common_custom_types", + "//mojo/public/mojom/base", "//services/preferences/public/mojom", "//skia/public/interfaces", + "//ui/accessibility:ax_enums_mojo", + "//ui/base/ime/chromeos/public/interfaces", "//ui/events/mojo:interfaces", + "//ui/gfx/geometry/mojo", "//ui/gfx/image/mojo:interfaces", + "//ui/gfx/range/mojo", "//ui/message_center/public/mojo:mojo", + "//url/mojom:url_mojom_gurl", ] component_output_prefix = "ash_public_interfaces_internal" @@ -83,5 +92,6 @@ mojom("test_interfaces") { ] deps = [ "//mojo/common:common_custom_types", + "//mojo/public/mojom/base", ] } diff --git a/chromium/ash/public/interfaces/accessibility_controller.mojom b/chromium/ash/public/interfaces/accessibility_controller.mojom index 804dfa0f56c..279bcc416a6 100644 --- a/chromium/ash/public/interfaces/accessibility_controller.mojom +++ b/chromium/ash/public/interfaces/accessibility_controller.mojom @@ -4,7 +4,7 @@ module ash.mojom; -import "mojo/common/time.mojom"; +import "mojo/public/mojom/base/time.mojom"; import "ui/accessibility/ax_enums.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; @@ -51,6 +51,10 @@ interface AccessibilityController { // Sets the focus highlight rect using |bounds_in_screen|. SetFocusHighlightRect(gfx.mojom.Rect bounds_in_screen); + + // Sets whether the accessibility panel is filling the entire screen (e.g. to + // show the expanded UI for the ChromeVox spoken feedback extension). + SetAccessibilityPanelFullscreen(bool fullscreen); }; // Interface for ash to request accessibility service from its client (e.g. @@ -67,7 +71,7 @@ interface AccessibilityControllerClient { // Initiates play of shutdown sound and returns sound duration. This method // exists because the browser owns all media playback. - PlayShutdownSound() => (mojo.common.mojom.TimeDelta sound_duration); + PlayShutdownSound() => (mojo_base.mojom.TimeDelta sound_duration); // Forwards an accessibility gesture from the touch exploration controller to // ChromeVox. diff --git a/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom b/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom new file mode 100644 index 00000000000..860140ee8e3 --- /dev/null +++ b/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom @@ -0,0 +1,37 @@ +// Copyright 2018 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. + +module ash.mojom; + +import "ui/gfx/geometry/mojo/geometry.mojom"; + +enum FocusRingBehavior { FADE_OUT_FOCUS_RING, PERSIST_FOCUS_RING }; + +// Interface for ash client (e.g. Chrome) to control and query accessibility +// focus ring features. +interface AccessibilityFocusRingController { + // Sets the focus ring color. + SetFocusRingColor(uint32 skcolor); + + // Resets the focus ring color back to the default. + ResetFocusRingColor(); + + // Draws a focus ring around the given set of rects in screen coordinates. Use + // |focus_ring_behavior| to specify whether the focus ring should persist or + // fade out. + SetFocusRing(array<gfx.mojom.Rect> rects_in_screen, + FocusRingBehavior focus_ring_behavior); + + // Hides focus ring on screen. + HideFocusRing(); + + // Draws a highlight at the given rects in screen coordinates. Rects may be + // overlapping and will be merged into one layer. This looks similar to + // selecting a region with the cursor, except it is drawn in the foreground + // rather than behind a text layer. + SetHighlights(array<gfx.mojom.Rect> rects_in_screen, uint32 skcolor); + + // Hides highlight on screen. + HideHighlights(); +}; diff --git a/chromium/ash/public/interfaces/app_list.mojom b/chromium/ash/public/interfaces/app_list.mojom index 48c43968f43..89eb5c198ac 100644 --- a/chromium/ash/public/interfaces/app_list.mojom +++ b/chromium/ash/public/interfaces/app_list.mojom @@ -9,6 +9,7 @@ import "components/sync/mojo/syncer.mojom"; import "mojo/public/mojom/base/string16.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; import "ui/gfx/image/mojo/image.mojom"; +import "ui/gfx/range/mojo/range.mojom"; // A structure holding the common information of AppListItem and // ChromeAppListItem, which is sent between ash and chrome representing @@ -23,6 +24,7 @@ struct AppListItemMetadata { string folder_id; // The id of the item's folder. syncer.mojom.StringOrdinal position; // The position of the item. bool is_folder; // Whether this item is a folder. + gfx.mojom.ImageSkia? icon; // The icon of this item. }; // All possible states of the app list. @@ -38,6 +40,52 @@ enum AppListModelStatus { kStatusSyncing, // Syncing apps or installing synced apps. }; +// How the result should be displayed. Do not change the order of these as +// they are used for metrics. +enum SearchResultDisplayType { + kNone = 0, + kList, + kTile, + kRecommendation, + kCard, + // Add new values here. +}; + +// Type of the search result, which is set in Chrome. +enum SearchResultType { + kInstalledApp, // Installed apps. + kPlayStoreApp, // Uninstalled apps from playstore. + kInstantApp, // Instant apps. + kInternalApp, // Chrome OS apps. + // Add new values here. +}; + +// A tagged range in search result text. +struct SearchResultTag { + // Similar to ACMatchClassification::Style, the style values are not + // mutually exclusive. + int16 styles; + gfx.mojom.Range range; +}; + +// Data representing an action that can be performed on a search result. +// An action could be represented as an icon set or as a blue button with +// a label. Icon set is chosen if label text is empty. Otherwise, a blue +// button with the label text will be used. +struct SearchResultActionImageLabel { + gfx.mojom.ImageSkia base_image; + gfx.mojom.ImageSkia hover_image; + gfx.mojom.ImageSkia pressed_Image; +}; +union SearchResultActionLabel { + SearchResultActionImageLabel image_label; + mojo_base.mojom.String16 text_label; +}; +struct SearchResultAction { + mojo_base.mojom.String16 tooltip_text; + SearchResultActionLabel label; +}; + // The Chrome app list (aka Launcher), is the place where user can find and // organize all installed apps, or search for various types of information. // @@ -125,6 +173,9 @@ interface AppListController { SetSearchHintText(mojo_base.mojom.String16 hint_text); // Sets the text for the search box's Textfield and the voice search flag. UpdateSearchBox(mojo_base.mojom.String16 text, bool initiated_by_user); + // Update the whole model, usually when profile changes happen in Chrome. + SetModelData(array<AppListItemMetadata> apps, + bool is_search_engine_google); ////////////////////////////////////////////////////////////////////////////// // Interfaces only used by ChromeAppListItem: diff --git a/chromium/ash/public/interfaces/app_list.typemap b/chromium/ash/public/interfaces/app_list.typemap index 6b66c5e1a70..66f8326ea07 100644 --- a/chromium/ash/public/interfaces/app_list.typemap +++ b/chromium/ash/public/interfaces/app_list.typemap @@ -5,7 +5,17 @@ mojom = "//ash/public/interfaces/app_list.mojom" public_headers = [ "//ash/public/cpp/app_list/app_list_types.h" ] traits_headers = [ "//ash/public/cpp/app_list/app_list_struct_traits.h" ] +sources = [ + "//ash/public/cpp/app_list/app_list_struct_traits.cc", +] +deps = [ + "//ui/gfx/range/mojo:struct_traits", +] type_mappings = [ "ash.mojom.AppListState=ash::AppListState", "ash.mojom.AppListModelStatus=ash::AppListModelStatus", + "ash.mojom.SearchResultType=ash::SearchResultType", + "ash.mojom.SearchResultDisplayType=ash::SearchResultDisplayType", + "ash.mojom.SearchResultTag=ash::SearchResultTag", + "ash.mojom.SearchResultAction=ash::SearchResultAction", ] diff --git a/chromium/ash/public/interfaces/ash_assistant_controller.mojom b/chromium/ash/public/interfaces/ash_assistant_controller.mojom new file mode 100644 index 00000000000..519ebea7d97 --- /dev/null +++ b/chromium/ash/public/interfaces/ash_assistant_controller.mojom @@ -0,0 +1,14 @@ +// Copyright 2018 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. + +module ash.mojom; + +import "chromeos/services/assistant/public/mojom/assistant.mojom"; + +// Interface for AssistantManagerService to communicate with +// AshAssistantController. +interface AshAssistantController { + // Provides a reference to the underlying service |assistant|. + SetAssistant(chromeos.assistant.mojom.Assistant assistant); +}; diff --git a/chromium/ash/public/interfaces/ash_message_center_controller.mojom b/chromium/ash/public/interfaces/ash_message_center_controller.mojom index 09367da6067..199ccebc60a 100644 --- a/chromium/ash/public/interfaces/ash_message_center_controller.mojom +++ b/chromium/ash/public/interfaces/ash_message_center_controller.mojom @@ -8,6 +8,7 @@ import "ui/gfx/image/mojo/image.mojom"; import "ui/message_center/public/mojo/notification.mojom"; import "ui/message_center/public/mojo/notifier_id.mojom"; import "mojo/public/mojom/base/string16.mojom"; +import "mojo/public/mojom/base/unguessable_token.mojom"; // A struct that contains information for presenting a notifier in a settings // panel. @@ -33,8 +34,12 @@ struct NotifierUiData { interface AshMessageCenterController { SetClient(associated AshMessageCenterClient client); - ShowClientNotification(message_center.mojom.Notification notification); + // Shows a notification. |display_token| will be used to reference this + // notification for AshMessageCenterClient::Close(). + ShowClientNotification(message_center.mojom.Notification notification, + mojo_base.mojom.UnguessableToken display_token); + // Closes a notification by the notification ID. CloseClientNotification(string id); UpdateNotifierIcon(message_center.mojom.NotifierId notifier_id, @@ -42,6 +47,10 @@ interface AshMessageCenterController { NotifierEnabledChanged(message_center.mojom.NotifierId notifier_id, bool enabled); + + // Gets a list of all the notifications in the message center. + GetActiveNotifications() => + (array<message_center.mojom.Notification> notifications); }; // The message center client interface mimics @@ -50,7 +59,8 @@ interface AshMessageCenterController { // the client. interface AshMessageCenterClient { // Called when a notification previously displayed by the client is closed. - HandleNotificationClosed(string id, bool by_user); + HandleNotificationClosed(mojo_base.mojom.UnguessableToken display_token, + bool by_user); // Called when the body of a notification is clicked. HandleNotificationClicked(string id); diff --git a/chromium/ash/public/interfaces/ime_controller.mojom b/chromium/ash/public/interfaces/ime_controller.mojom index c60b65482d0..6a22b8f37c1 100644 --- a/chromium/ash/public/interfaces/ime_controller.mojom +++ b/chromium/ash/public/interfaces/ime_controller.mojom @@ -5,6 +5,7 @@ module ash.mojom; import "ash/public/interfaces/ime_info.mojom"; +import "ui/base/ime/chromeos/public/interfaces/ime_keyset.mojom"; // Interface for ash client (e.g. Chrome) to send input method info to ash. interface ImeController { @@ -29,7 +30,13 @@ interface ImeController { // Report caps lock state changes from chrome (which is the source of truth) // to the tray. - SetCapsLockState(bool enabled); + UpdateCapsLockState(bool enabled); + + // Report keyboard layout changes from chrome (which is the source of truth) + // This is also called when a connection is first established between + // ImeController and ImeControllerClient. + // The layout name is a XKB keyboard layout name (e.g. "us"). + OnKeyboardLayoutNameChanged(string layout_name); // Report the enabled state of the various extra input options (currently // emoji, handwriting, and voice input). |is_extra_input_options_enabled| set @@ -63,10 +70,16 @@ interface ImeControllerClient { ActivateImeMenuItem(string key); // When the caps lock state change originates from the tray (i.e. clicking the - // caps lock toggle from the settings menu from the caps lock icon), propagate - // the change to the client without sending a change notification back to the - // tray. + // caps lock toggle from the settings menu from the caps lock icon), from an + // accelerator (e.g. pressing Alt + Search), or from the debug UI (i.e. + // toggling the caps lock button), propagate the change to the client without + // sending a change notification back. // TODO(crbug/759435): Ideally this interaction should only be to disable the // caps lock. - SetCapsLockFromTray(bool enabled); + SetCapsLockEnabled(bool enabled); + + // Overrides the keyboard keyset (emoji, handwriting or voice). If keyset is + // 'kNone', we switch to the default keyset. Because this is asynchronous, + // any code that needs the keyset to be updated first must use the callback. + OverrideKeyboardKeyset(chromeos.input_method.mojom.ImeKeyset keyset) => (); }; diff --git a/chromium/ash/public/interfaces/login_screen.mojom b/chromium/ash/public/interfaces/login_screen.mojom index 8fd9a31b19d..f765ef9793e 100644 --- a/chromium/ash/public/interfaces/login_screen.mojom +++ b/chromium/ash/public/interfaces/login_screen.mojom @@ -5,9 +5,10 @@ module ash.mojom; import "ash/public/interfaces/login_user_info.mojom"; +import "chromeos/components/proximity_auth/public/interfaces/auth_type.mojom"; import "components/password_manager/public/interfaces/sync_password_data.mojom"; -import "components/proximity_auth/public/interfaces/auth_type.mojom"; import "components/signin/public/interfaces/account_id.mojom"; +import "mojo/common/values.mojom"; import "mojo/public/mojom/base/string16.mojom"; // Allows clients (e.g. Chrome browser) to control the ash login/lock/user-add @@ -82,6 +83,24 @@ interface LoginScreen { // Check if the login/lock screen is ready for a password. IsReadyForPassword() => (bool is_ready); + + // Set the public session display name for user with |account_id|. + SetPublicSessionDisplayName(signin.mojom.AccountId account_id, + string display_name); + + // Set the public session locales for user with |account_id|. + // TODO: Use array<LocaleStruct> for |locales| instead of + // mojo.common.mojom.ListValue. + // |locales|: Available locales for this user. + // Each entry is a base::DictionaryValue and it contains several + // keys like displayName, nativeDisplayName, optionGroupName etc. + // |default_locale|: Default locale for this user. + // |show_advanced_view|: True if we should show the advanced expanded user + // view for the public session. + SetPublicSessionLocales(signin.mojom.AccountId account_id, + mojo.common.mojom.ListValue locales, + string default_locale, + bool show_advanced_view); }; // Allows ash lock screen to control a client (e.g. Chrome browser). Requests @@ -147,4 +166,20 @@ interface LoginScreenClient { // Show Gaia signin dialog in chrome. ShowGaiaSignin(); + + // Notification that the remove user warning was shown. + OnRemoveUserWarningShown(); + + // Try to remove |account_id|. + RemoveUser(signin.mojom.AccountId account_id); + + // Launch a public session for user with |account_id|. + // |locale|: Locale for this user. + // The value is language code like "en-US", "zh-CN" + // |input_method|: Input method for this user. + // This is the id of InputMethodDescriptor like + // "t:latn-post", "pinyin". + LaunchPublicSession(signin.mojom.AccountId account_id, + string locale, + string input_method); }; diff --git a/chromium/ash/public/interfaces/login_user_info.mojom b/chromium/ash/public/interfaces/login_user_info.mojom index 508fd881cdd..8f27b2186ad 100644 --- a/chromium/ash/public/interfaces/login_user_info.mojom +++ b/chromium/ash/public/interfaces/login_user_info.mojom @@ -5,7 +5,7 @@ module ash.mojom; import "ash/public/interfaces/user_info.mojom"; -import "components/proximity_auth/public/interfaces/auth_type.mojom"; +import "chromeos/components/proximity_auth/public/interfaces/auth_type.mojom"; import "mojo/common/values.mojom"; import "mojo/public/mojom/base/string16.mojom"; diff --git a/chromium/ash/public/interfaces/night_light_controller.mojom b/chromium/ash/public/interfaces/night_light_controller.mojom index c1bc8174551..ddad119494c 100644 --- a/chromium/ash/public/interfaces/night_light_controller.mojom +++ b/chromium/ash/public/interfaces/night_light_controller.mojom @@ -32,9 +32,6 @@ interface NightLightController { // Toggled automatically based on the custom set start and end times // selected by the user from the system settings. kCustom = 2, - - // Must be the last item, used for UMA histograms. - kLast = kCustom, }; // Sets the client that will be notified of changes in the Night Light @@ -52,4 +49,4 @@ interface NightLightController { interface NightLightClient { // Notifies the client with the new schedule type whenever it changes. OnScheduleTypeChanged(NightLightController.ScheduleType new_type); -};
\ No newline at end of file +}; diff --git a/chromium/ash/public/interfaces/process_creation_time_recorder.mojom b/chromium/ash/public/interfaces/process_creation_time_recorder.mojom index 3f9e23bac3b..9e13caf3112 100644 --- a/chromium/ash/public/interfaces/process_creation_time_recorder.mojom +++ b/chromium/ash/public/interfaces/process_creation_time_recorder.mojom @@ -4,9 +4,9 @@ module ash.mojom; -import "mojo/common/time.mojom"; +import "mojo/public/mojom/base/time.mojom"; interface ProcessCreationTimeRecorder { // Sets the time the main process was created at, used for logging metrics. - SetMainProcessCreationTime(mojo.common.mojom.TimeTicks start_time); + SetMainProcessCreationTime(mojo_base.mojom.TimeTicks start_time); }; diff --git a/chromium/ash/public/interfaces/session_controller.mojom b/chromium/ash/public/interfaces/session_controller.mojom index 75d910bb6cc..19bc61211af 100644 --- a/chromium/ash/public/interfaces/session_controller.mojom +++ b/chromium/ash/public/interfaces/session_controller.mojom @@ -6,7 +6,7 @@ module ash.mojom; import "ash/public/interfaces/user_info.mojom"; import "components/signin/public/interfaces/account_id.mojom"; -import "mojo/common/time.mojom"; +import "mojo/public/mojom/base/time.mojom"; // Matches session_manager::SessionState. enum SessionState { @@ -158,8 +158,8 @@ interface SessionController { // NOTE: Chrome enforces the limit, not ash. Ash could enforce it if local // state prefs and user activity monitoring were available under mustash. // http://crbug.com/729808 - SetSessionLengthLimit(mojo.common.mojom.TimeDelta length_limit, - mojo.common.mojom.TimeTicks start_time); + SetSessionLengthLimit(mojo_base.mojom.TimeDelta length_limit, + mojo_base.mojom.TimeTicks start_time); // Returns whether it's ok to switch the active multiprofile user. May affect // or be affected by system state such as window overview mode and screen @@ -177,6 +177,12 @@ interface SessionController { // Shows a dialog that explains that the given user is no longer allowed in // the session due to a policy change, and aborts the session. ShowMultiprofilesSessionAbortedDialog(string user_email); + + // Adds session activation observer. The observer is called when session + // with |account_id| is becoming active or inactive. The observer is + // immediately called for upon registration with the current status. + AddSessionActivationObserverForAccountId( + signin.mojom.AccountId account_id, SessionActivationObserver observer); }; // Interface for ash to request session service from its client (e.g. Chrome). @@ -197,3 +203,13 @@ interface SessionControllerClient { // Show the multi-profile login UI to add another user to this session. ShowMultiProfileLogin(); }; + +// Interface for ash to notify client of sessions status for a specific +// |account_id|. +interface SessionActivationObserver { + // Called the session is becoming active or inactive. + OnSessionActivated(bool activated); + + // Called when lock screen state changes. + OnLockStateChanged(bool locked); +}; diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom index 44bb103a165..8414c65a383 100644 --- a/chromium/ash/public/interfaces/system_tray.mojom +++ b/chromium/ash/public/interfaces/system_tray.mojom @@ -131,6 +131,9 @@ interface SystemTrayClient { // be any string. ShowNetworkSettings(string network_id); + // Shows the MultiDevice setup flow dialog. + ShowMultiDeviceSetup(); + // Attempts to restart the system for update. RequestRestartForUpdate(); }; diff --git a/chromium/ash/public/interfaces/time_to_first_present_recorder_test_api.mojom b/chromium/ash/public/interfaces/time_to_first_present_recorder_test_api.mojom index bd694a85f93..a4f0c02485a 100644 --- a/chromium/ash/public/interfaces/time_to_first_present_recorder_test_api.mojom +++ b/chromium/ash/public/interfaces/time_to_first_present_recorder_test_api.mojom @@ -4,11 +4,11 @@ module ash.mojom; -import "mojo/common/time.mojom"; +import "mojo/public/mojom/base/time.mojom"; // Used to test internal state of TimeToFirstPresentRecorder. interface TimeToFirstPresentRecorderTestApi { // Returns the time between process creation and the first pixels shown on // screen. - GetProcessCreationToFirstPresentTime() => (mojo.common.mojom.TimeDelta delta); + GetProcessCreationToFirstPresentTime() => (mojo_base.mojom.TimeDelta delta); }; diff --git a/chromium/ash/public/interfaces/tray_action.mojom b/chromium/ash/public/interfaces/tray_action.mojom index 4e08e4831b9..e366f9a1ec2 100644 --- a/chromium/ash/public/interfaces/tray_action.mojom +++ b/chromium/ash/public/interfaces/tray_action.mojom @@ -42,10 +42,6 @@ enum LockScreenNoteOrigin { // The user ejected the stylus tool from the device. kStylusEject = 4, - - // Not a real value - used primarily for UMA reporting (to report upper bound - // of valid histogram values). - kCount }; // Reason for closing a lock screen note, and consequentially closing any @@ -76,10 +72,6 @@ enum CloseLockScreenNoteReason { // The user pressed "Unlock" button on the lock screen UI. kUnlockButtonPressed = 6, - - // Not a real value - used primarily for UMA reporting (to report upper bound - // of valid histogram values). - kCount }; // Used by a client (e.g. Chrome) to set up a handler for a tray action, and diff --git a/chromium/ash/public/interfaces/vpn_list.mojom b/chromium/ash/public/interfaces/vpn_list.mojom index 3c030fe527c..f190c7f43ae 100644 --- a/chromium/ash/public/interfaces/vpn_list.mojom +++ b/chromium/ash/public/interfaces/vpn_list.mojom @@ -4,7 +4,7 @@ module ash.mojom; -import "mojo/common/time.mojom"; +import "mojo/public/mojom/base/time.mojom"; // Describes a third-party VPN provided by an extension (e.g. Cisco AnyConnect). struct ThirdPartyVpnProvider { @@ -22,7 +22,7 @@ struct ArcVpnProvider { // Unique app id for launching the app. e.g. pbmkokpdlpfmapoiccpblbmjjhhabjaa string app_id; // Last launch time of the Arc VPN provider. - mojo.common.mojom.Time last_launch_time; + mojo_base.mojom.Time last_launch_time; }; // Manages the VPN provider list in ash. Allows extension-backed VPN providers diff --git a/chromium/ash/public/interfaces/wallpaper.mojom b/chromium/ash/public/interfaces/wallpaper.mojom index aaf36d157b7..d91a7c3e9eb 100644 --- a/chromium/ash/public/interfaces/wallpaper.mojom +++ b/chromium/ash/public/interfaces/wallpaper.mojom @@ -6,12 +6,12 @@ module ash.mojom; import "ash/public/interfaces/user_info.mojom"; import "components/signin/public/interfaces/account_id.mojom"; -import "mojo/common/file_path.mojom"; -import "mojo/common/time.mojom"; -import "skia/public/interfaces/bitmap.mojom"; +import "mojo/public/mojom/base/file_path.mojom"; +import "mojo/public/mojom/base/time.mojom"; +import "ui/gfx/image/mojo/image.mojom"; import "url/mojom/url.mojom"; -// These values match wallpaper::WallpaperLayout. +// These values match ash::WallpaperLayout. enum WallpaperLayout { CENTER, CENTER_CROPPED, @@ -51,29 +51,33 @@ interface WallpaperController { // reside. // |chromeos_custom_wallpapers_path|: Directory where custom wallpapers // reside. + // |device_policy_wallpaper_path|: The file path of the device policy + // wallpaper (if any). // |is_device_wallpaper_policy_enforced|: Whether the device wallpaper policy // is enforced on the device. Init(WallpaperControllerClient client, - mojo.common.mojom.FilePath user_data_path, - mojo.common.mojom.FilePath chromeos_wallpapers_path, - mojo.common.mojom.FilePath chromeos_custom_wallpapers_path, + mojo_base.mojom.FilePath user_data_path, + mojo_base.mojom.FilePath chromeos_wallpapers_path, + mojo_base.mojom.FilePath chromeos_custom_wallpapers_path, + mojo_base.mojom.FilePath device_policy_wallpaper_path, bool is_device_wallpaper_policy_enforced); - // Sets wallpaper from a local file. Saves the custom wallpaper to file, posts - // task to generate thumbnail and updates local state. + // Sets wallpaper from a local file and updates the saved wallpaper info for + // the user. // |user_info|: The user's information related to wallpaper. // |wallpaper_files_id|: The file id for user_info.account_id. // |file_name|: The name of the wallpaper file. // |layout|: The layout of the wallpaper, used for wallpaper resizing. // |image|: The wallpaper image. - // |show_wallpaper|: If false, don't show the new wallpaper now but only - // update cache. + // |preview_mode|: If true, show the wallpaper immediately but doesn't change + // the user wallpaper info until |ConfirmPreviewWallpaper| is + // called. SetCustomWallpaper(WallpaperUserInfo user_info, string wallpaper_files_id, string file_name, WallpaperLayout layout, - skia.mojom.Bitmap image, - bool show_wallpaper); + gfx.mojom.ImageSkia image, + bool preview_mode); // Sets wallpaper from the wallpaper picker selection, i.e., the wallpaper // type is ONLINE. @@ -82,13 +86,14 @@ interface WallpaperController { // |url|: The url corresponding to this wallpaper. Used as a placeholder for // the location in WallpaperInfo. // |layout|: The layout of the wallpaper, used for wallpaper resizing. - // |show_wallpaper|: If false, don't show the new wallpaper now but only - // update cache. + // |preview_mode|: If true, show the wallpaper immediately but doesn't change + // the user wallpaper info until |ConfirmPreviewWallpaper| is + // called. SetOnlineWallpaper(WallpaperUserInfo user_info, - skia.mojom.Bitmap image, + gfx.mojom.ImageSkia image, string url, WallpaperLayout layout, - bool show_wallpaper); + bool preview_mode); // Sets the user's wallpaper to be the default wallpaper. Note: different user // types may have different default wallpapers. @@ -108,8 +113,8 @@ interface WallpaperController { // |customized_default_large_path|: The file path of the large-size customized // default wallpaper, if any. SetCustomizedDefaultWallpaperPaths( - mojo.common.mojom.FilePath customized_default_small_path, - mojo.common.mojom.FilePath customized_default_large_path); + mojo_base.mojom.FilePath customized_default_small_path, + mojo_base.mojom.FilePath customized_default_large_path); // Sets wallpaper from policy. If the user has logged in, show the policy // wallpaper immediately, otherwise, the policy wallpaper will be shown the @@ -126,6 +131,37 @@ interface WallpaperController { // clears the device policy controlled wallpaper if applicable. SetDeviceWallpaperPolicyEnforced(bool enforced); + // Sets wallpaper from a third-party app (as opposed to the Chrome OS + // wallpaper picker). + // |user_info|: The user's information related to wallpaper. + // |wallpaper_files_id|: The file id for user_info.account_id. + // |file_name|: The name of the wallpaper file. + // |layout|: The layout of the wallpaper, used for wallpaper resizing. + // |image|: The wallpaper image. + // |allowed|: If the wallpaper is allowed to be shown on screen. It's false if + // 1) the user is not permitted to change wallpaper, or + // 2) updating the on-screen wallpaper is not allowed at the + // given moment. + // |image_id|: A unique id assigned to the image. Clients may be interested in + // observing all wallpaper changes and acting differently based on + // if the wallpaper change is due to their own request. In order + // to do so, they should compare this value with the one that's + // returned by |OnWallpaperChanged|. + SetThirdPartyWallpaper(WallpaperUserInfo user_info, + string wallpaper_files_id, + string file_name, + WallpaperLayout layout, + gfx.mojom.ImageSkia image) + => (bool allowed, uint32 image_id); + + // Confirms the wallpaper being previewed to be set as the actual user + // wallpaper. Must be called in preview mode. + ConfirmPreviewWallpaper(); + + // Cancels the wallpaper preview and reverts to the user wallpaper. Must be + // called in preview mode. + CancelPreviewWallpaper(); + // Updates the layout for the user's custom wallpaper and reloads the // wallpaper with the new layout. // |user_info|: The user's information related to wallpaper. @@ -160,16 +196,28 @@ interface WallpaperController { // Sets wallpaper animation duration. Passing an empty value disables the // animation. - SetAnimationDuration(mojo.common.mojom.TimeDelta animation_duration); + SetAnimationDuration(mojo_base.mojom.TimeDelta animation_duration); // Opens the wallpaper picker if the active user is not controlled by policy // and it's allowed to change wallpaper per the user type and the login state. OpenWallpaperPickerIfAllowed(); + // Minimizes all windows except the active window. + // |user_id_hash|: The hash value corresponding to |User::username_hash|. + MinimizeInactiveWindows(string user_id_hash); + + // Restores all minimized windows to their previous states. This should only + // be called after calling |MinimizeInactiveWindows|. + // |user_id_hash|: The hash value corresponding to |User::username_hash|. + RestoreMinimizedWindows(string user_id_hash); + // Calling this method triggers an initial notification of the wallpaper // state. Observers are automatically removed as their connections are closed. AddObserver(associated WallpaperObserver observer); + // Returns the wallpaper image currently being shown. + GetWallpaperImage() => (gfx.mojom.ImageSkia image); + // Runs to get wallpaper prominent colors. GetWallpaperColors() => (array<uint32> prominent_colors); @@ -178,6 +226,11 @@ interface WallpaperController { // returns false. IsActiveUserWallpaperControlledByPolicy() => (bool controlled); + // Returns the location of the active user's wallpaper (either a url or a file + // path, corresponding to |WallpaperInfo.location|). Returns an empty string + // if there's no active user. + GetActiveUserWallpaperLocation() => (string loaction); + // Returns true if the wallpaper setting (used to open the wallpaper picker) // should be visible. ShouldShowWallpaperSetting() => (bool show); @@ -201,9 +254,14 @@ interface WallpaperControllerClient { // Used to listen for wallpaper state changed. interface WallpaperObserver { - // Called when the colors extracted from the current wallpaper change. May - // be called as a side effect of changing the wallpaper on the - // WallpaperController, e.g. WallpaperController::SetWallpaperImage(). - // Colors are ordered and are referenced in wallpaper::ColorProfileType. + // Invoked when the wallpaper is changed. |image_id| is the unique id assigned + // to the current wallpaper image. It should only be used to compare against + // the value returned by a setting wallpaper request earlier + // (e.g. SetThirdPartyWallpaper). This value is unique to each |ImageSkia| + // object and is different for two objects with the same pixels. + OnWallpaperChanged(uint32 image_id); + + // Called when the colors extracted from the current wallpaper change. Colors + // are ordered and are referenced in wallpaper::ColorProfileType. OnWallpaperColorsChanged(array<uint32> prominent_colors); }; diff --git a/chromium/ash/public/interfaces/wallpaper.typemap b/chromium/ash/public/interfaces/wallpaper.typemap index aae8e352e8e..16b5792f59b 100644 --- a/chromium/ash/public/interfaces/wallpaper.typemap +++ b/chromium/ash/public/interfaces/wallpaper.typemap @@ -3,6 +3,6 @@ # found in the LICENSE file. mojom = "//ash/public/interfaces/wallpaper.mojom" -public_headers = [ "//components/wallpaper/wallpaper_info.h" ] +public_headers = [ "//ash/public/cpp/wallpaper_types.h" ] traits_headers = [ "//ash/public/cpp/wallpaper_struct_traits.h" ] -type_mappings = [ "ash.mojom.WallpaperLayout=wallpaper::WallpaperLayout" ] +type_mappings = [ "ash.mojom.WallpaperLayout=ash::WallpaperLayout" ] diff --git a/chromium/ash/resources/BUILD.gn b/chromium/ash/resources/BUILD.gn index 5da425e5a77..b337be9c919 100644 --- a/chromium/ash/resources/BUILD.gn +++ b/chromium/ash/resources/BUILD.gn @@ -62,8 +62,10 @@ template("ash_test_resources") { if (percent == "100") { # TODO(msw): This seems bad, but follows repack_ui_test_pak's example. - deps += [ "//third_party/WebKit/public:resources_grit" ] - sources += [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ] + deps += [ "//third_party/blink/public:resources_grit" ] + sources += [ + "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak", + ] } } } diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 53e84035c49..5cd1b17dcdd 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -9,65 +9,38 @@ aggregate_vector_icons("ash_vector_icons") { icon_directory = "." icons = [ - "captive_portal.1x.icon", "captive_portal.icon", - "check_circle.1x.icon", "check_circle.icon", - "ime_menu_emoticon.1x.icon", "ime_menu_emoticon.icon", - "ime_menu_microphone.1x.icon", "ime_menu_microphone.icon", - "ime_menu_on_screen_keyboard.1x.icon", "ime_menu_on_screen_keyboard.icon", - "ime_menu_write.1x.icon", "ime_menu_write.icon", - "lock_screen_alert.1x.icon", "lock_screen_alert.icon", - "lock_screen_arrow.1x.icon", "lock_screen_arrow.icon", - "lock_screen_backspace.1x.icon", "lock_screen_backspace.icon", - "lock_screen_caps_lock.1x.icon", "lock_screen_caps_lock.icon", - "lock_screen_dropdown.1x.icon", "lock_screen_dropdown.icon", - "network_badge_add_other.1x.icon", + "login_screen_button_dropdown.icon", + "login_screen_menu_dropdown.icon", + "login_screen_enterprise.icon", "network_badge_add_other.icon", - "network_badge_captive_portal.1x.icon", "network_badge_captive_portal.icon", - "network_badge_off.1x.icon", "network_badge_off.icon", - "network_badge_roaming.1x.icon", "network_badge_roaming.icon", - "network_badge_secure.1x.icon", "network_badge_secure.icon", - "network_badge_technology_1x.1x.icon", "network_badge_technology_1x.icon", - "network_badge_technology_3g.1x.icon", "network_badge_technology_3g.icon", - "network_badge_technology_4g.1x.icon", "network_badge_technology_4g.icon", - "network_badge_technology_edge.1x.icon", "network_badge_technology_edge.icon", - "network_badge_technology_evdo.1x.icon", "network_badge_technology_evdo.icon", - "network_badge_technology_gprs.1x.icon", "network_badge_technology_gprs.icon", - "network_badge_technology_hspa.1x.icon", "network_badge_technology_hspa.icon", - "network_badge_technology_hspa_plus.1x.icon", "network_badge_technology_hspa_plus.icon", - "network_badge_technology_lte.1x.icon", "network_badge_technology_lte.icon", - "network_badge_technology_lte_advanced.1x.icon", "network_badge_technology_lte_advanced.icon", - "network_badge_vpn.1x.icon", "network_badge_vpn.icon", - "network_ethernet.1x.icon", "network_ethernet.icon", - "network_mobile_not_connected_x.1x.icon", "network_mobile_not_connected_x.icon", - "network_vpn.1x.icon", "network_vpn.icon", "notification_accessibility.icon", "notification_accessibility_braille.icon", @@ -91,223 +64,123 @@ aggregate_vector_icons("ash_vector_icons") { "notification_monitor_warning.icon", "notification_screen.icon", "notification_screenshare.icon", - "notification_settings.icon", "notification_sms_sync.icon", "notification_stylus_battery_warning.icon", "notification_supervised.icon", "notification_timer.icon", "overview_text_filter_search.icon", "overview_window_close.icon", - "palette_action_capture_region.1x.icon", "palette_action_capture_region.icon", - "palette_action_capture_screen.1x.icon", "palette_action_capture_screen.icon", - "palette_action_create_note.1x.icon", "palette_action_create_note.icon", - "palette_mode_laser_pointer.1x.icon", "palette_mode_laser_pointer.icon", - "palette_mode_magnify.1x.icon", "palette_mode_magnify.icon", - "palette_mode_metalayer.1x.icon", "palette_mode_metalayer.icon", - "palette_tray_icon_capture_region.1x.icon", "palette_tray_icon_capture_region.icon", - "palette_tray_icon_default.1x.icon", "palette_tray_icon_default.icon", - "palette_tray_icon_laser_pointer.1x.icon", "palette_tray_icon_laser_pointer.icon", - "palette_tray_icon_magnify.1x.icon", "palette_tray_icon_magnify.icon", - "palette_tray_icon_metalayer.1x.icon", "palette_tray_icon_metalayer.icon", - "shelf_add_person_button.1x.icon", "shelf_add_person_button.icon", - "shelf_back.1x.icon", "shelf_back.icon", - "shelf_browse_as_guest_button.1x.icon", "shelf_browse_as_guest_button.icon", - "shelf_cancel_button.1x.icon", "shelf_cancel_button.icon", - "shelf_keyboard.1x.icon", "shelf_keyboard.icon", - "shelf_logout.1x.icon", "shelf_logout.icon", - "shelf_notifications.1x.icon", "shelf_notifications.icon", - "shelf_overflow.1x.icon", "shelf_overflow.icon", - "shelf_overview.1x.icon", "shelf_overview.icon", - "shelf_shutdown_button.1x.icon", "shelf_shutdown_button.icon", - "shelf_sign_out_button.1x.icon", "shelf_sign_out_button.icon", - "shelf_unlock_button.1x.icon", "shelf_unlock_button.icon", - "system_menu_accessibility.1x.icon", "system_menu_accessibility.icon", - "system_menu_accessibility_auto_click.1x.icon", "system_menu_accessibility_auto_click.icon", - "system_menu_accessibility_chromevox.1x.icon", "system_menu_accessibility_chromevox.icon", - "system_menu_accessibility_contrast.1x.icon", "system_menu_accessibility_contrast.icon", - "system_menu_accessibility_docked_magnifier.1x.icon", "system_menu_accessibility_docked_magnifier.icon", - "system_menu_accessibility_fullscreen_magnifier.1x.icon", "system_menu_accessibility_fullscreen_magnifier.icon", - "system_menu_accessibility_select_to_speak.1x.icon", "system_menu_accessibility_select_to_speak.icon", "system_menu_audio_input.icon", - "system_menu_audio_input.1x.icon", "system_menu_audio_output.icon", - "system_menu_audio_output.1x.icon", - "system_menu_add_connection.1x.icon", "system_menu_add_connection.icon", - "system_menu_arrow_back.1x.icon", "system_menu_arrow_back.icon", - "system_menu_arrow_right.1x.icon", "system_menu_arrow_right.icon", - "system_menu_bluetooth.1x.icon", "system_menu_bluetooth.icon", - "system_menu_bluetooth_connected.1x.icon", "system_menu_bluetooth_connected.icon", - "system_menu_bluetooth_disabled.1x.icon", "system_menu_bluetooth_disabled.icon", - "system_menu_brightness.1x.icon", "system_menu_brightness.icon", - "system_menu_business.1x.icon", "system_menu_business.icon", - "system_menu_caps_lock.1x.icon", "system_menu_caps_lock.icon", - "system_menu_cast.1x.icon", "system_menu_cast.icon", - "system_menu_cast_audio.1x.icon", "system_menu_cast_audio.icon", - "system_menu_cast_audio_group.1x.icon", "system_menu_cast_audio_group.icon", - "system_menu_cast_enabled.1x.icon", "system_menu_cast_enabled.icon", - "system_menu_cast_generic.1x.icon", "system_menu_cast_generic.icon", - "system_menu_cast_message.1x.icon", "system_menu_cast_message.icon", - "system_menu_child_user.1x.icon", "system_menu_child_user.icon", - "system_menu_computer.1x.icon", "system_menu_computer.icon", - "system_menu_gamepad.1x.icon", "system_menu_gamepad.icon", - "system_menu_guest.1x.icon", "system_menu_guest.icon", - "system_menu_hdmi.1x.icon", "system_menu_hdmi.icon", - "system_menu_headset.1x.icon", "system_menu_headset.icon", - "system_menu_help.1x.icon", "system_menu_help.icon", - "system_menu_info.1x.icon", "system_menu_info.icon", - "system_menu_keyboard.1x.icon", "system_menu_keyboard.icon", - "system_menu_keyboard_brightness.1x.icon", "system_menu_keyboard_brightness.icon", - "system_menu_lock.1x.icon", "system_menu_lock.icon", - "system_menu_mouse.1x.icon", "system_menu_mouse.icon", - "system_menu_phone.1x.icon", "system_menu_phone.icon", - "system_menu_power.1x.icon", "system_menu_power.icon", - "system_menu_rotation_lock_auto.1x.icon", "system_menu_rotation_lock_auto.icon", - "system_menu_rotation_lock_landscape.1x.icon", "system_menu_rotation_lock_landscape.icon", - "system_menu_rotation_lock_portrait.1x.icon", "system_menu_rotation_lock_portrait.icon", - "system_menu_screen_share.1x.icon", "system_menu_screen_share.icon", - "system_menu_settings.1x.icon", "system_menu_settings.icon", - "system_menu_supervised_user.1x.icon", "system_menu_supervised_user.icon", - "system_menu_tablet.1x.icon", "system_menu_tablet.icon", - "system_menu_timer.1x.icon", - "system_menu_tracing.1x.icon", "system_menu_tracing.icon", "system_menu_timer.icon", - "system_menu_update.1x.icon", "system_menu_update.icon", - "system_menu_new_user.1x.icon", "system_menu_new_user.icon", - "system_menu_night_light_off.1x.icon", "system_menu_night_light_off.icon", - "system_menu_night_light_on.1x.icon", "system_menu_night_light_on.icon", - "system_menu_usb.1x.icon", "system_menu_usb.icon", - "system_menu_videocam.1x.icon", "system_menu_videocam.icon", - "system_menu_volume_high.1x.icon", "system_menu_volume_high.icon", - "system_menu_volume_low.1x.icon", "system_menu_volume_low.icon", - "system_menu_volume_medium.1x.icon", "system_menu_volume_medium.icon", - "system_menu_volume_mute.1x.icon", "system_menu_volume_mute.icon", "system_power_button_menu_power_off.icon", "system_power_button_menu_sign_out.icon", - "system_tray_accessibility.1x.icon", "system_tray_accessibility.icon", - "system_tray_battery_alert.1x.icon", "system_tray_battery_alert.icon", - "system_tray_battery_bolt.1x.icon", "system_tray_battery_bolt.icon", - "system_tray_battery_unreliable.1x.icon", "system_tray_battery_unreliable.icon", - "system_tray_battery_x.1x.icon", "system_tray_battery_x.icon", - "system_tray_caps_lock.1x.icon", "system_tray_caps_lock.icon", - "system_tray_cast.1x.icon", "system_tray_cast.icon", - "system_tray_night_light.1x.icon", "system_tray_night_light.icon", - "system_tray_recording.1x.icon", "system_tray_recording.icon", - "system_tray_rotation_lock_auto.1x.icon", "system_tray_rotation_lock_auto.icon", - "system_tray_rotation_lock_locked.1x.icon", "system_tray_rotation_lock_locked.icon", - "system_tray_screen_share.1x.icon", "system_tray_screen_share.icon", - "system_tray_tracing.1x.icon", "system_tray_tracing.icon", - "system_tray_update.1x.icon", "system_tray_update.icon", - "system_tray_volume_mute.1x.icon", "system_tray_volume_mute.icon", - "touch_calibration_complete_check.1x.icon", "touch_calibration_complete_check.icon", "touch_calibration_hand.icon", - "tray_action_new_lock_screen_note.1x.icon", "tray_action_new_lock_screen_note.icon", - "window_control_back.1x.icon", "window_control_back.icon", + "window_control_dezoom.icon", + "window_control_menu.icon", + "window_control_zoom.icon", ] if (is_chrome_branded) { icons += [ - "system_menu_cast_device.1x.icon", "system_menu_cast_device.icon", - "system_menu_cast_education.1x.icon", "system_menu_cast_education.icon", - "system_menu_cast_hangout.1x.icon", "system_menu_cast_hangout.icon", - "system_menu_cast_meeting.1x.icon", "system_menu_cast_meeting.icon", ] } diff --git a/chromium/ash/standalone/BUILD.gn b/chromium/ash/standalone/BUILD.gn index 3b70c57f379..c438c0e1653 100644 --- a/chromium/ash/standalone/BUILD.gn +++ b/chromium/ash/standalone/BUILD.gn @@ -20,10 +20,10 @@ service("ash_standalone") { "//ash:ash_service_resources", "//ash:ash_service_resources_200", "//ash:ash_shell_lib", + "//ash/app_list/presenter", "//services/service_manager/public/cpp", "//services/ui/public/cpp/input_devices", "//services/ui/public/interfaces", - "//ui/app_list/presenter", "//ui/views/examples:views_examples_lib", ] |