diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
| commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
| tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/ash | |
| parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
| download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz | |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ash')
33 files changed, 283 insertions, 1345 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index 617522dc459..f267d2d5439 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -28,15 +28,16 @@ component("ash") { "ash_service.h", # TODO: move the following to source. Do NOT add new files here. - "accessibility/accessibility_controller.h", + "accessibility/accessibility_controller_impl.h", "accessibility/accessibility_delegate.h", "accessibility/focus_ring_controller.h", "app_list/app_list_controller_impl.h", "detachable_base/detachable_base_handler.h", "detachable_base/detachable_base_observer.h", "display/display_prefs.h", + "display/output_protection_delegate.h", "display/screen_orientation_controller.h", - "events/event_rewriter_controller.h", + "events/event_rewriter_controller_impl.h", "focus_cycler.h", "frame/header_view.h", "frame/non_client_frame_view_ash.h", @@ -48,11 +49,14 @@ component("ash") { "multi_user/multi_user_window_manager_impl.h", "public/cpp/arc_custom_tab.h", "public/cpp/ash_prefs.h", + "public/cpp/assistant/assistant_settings.h", "public/cpp/docked_magnifier_controller.h", + "public/cpp/event_rewriter_controller.h", "public/cpp/first_run_helper.h", "public/cpp/multi_user_window_manager.h", "public/cpp/multi_user_window_manager_delegate.h", "public/cpp/multi_user_window_manager_observer.h", + "public/cpp/window_finder.h", "public/cpp/window_tree_host_lookup.h", "root_window_controller.h", "screenshot_delegate.h", @@ -78,10 +82,8 @@ component("ash") { "wm/splitview/split_view_controller.h", "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.h", "wm/tablet_mode/tablet_mode_controller.h", - "wm/tablet_mode/tablet_mode_observer.h", "wm/tablet_mode/tablet_mode_window_drag_controller.h", "wm/tablet_mode/tablet_mode_window_drag_delegate.h", - "wm/window_finder.h", "wm/window_positioner.h", "wm/window_positioning_utils.h", "wm/window_properties.h", @@ -121,13 +123,13 @@ component("ash") { "accelerometer/accelerometer_reader.h", "accelerometer/accelerometer_types.cc", "accelerometer/accelerometer_types.h", - "accessibility/accessibility_controller.cc", + "accessibility/accessibility_controller_impl.cc", "accessibility/accessibility_cursor_ring_layer.cc", "accessibility/accessibility_cursor_ring_layer.h", "accessibility/accessibility_focus_ring.cc", "accessibility/accessibility_focus_ring.h", - "accessibility/accessibility_focus_ring_controller.cc", - "accessibility/accessibility_focus_ring_controller.h", + "accessibility/accessibility_focus_ring_controller_impl.cc", + "accessibility/accessibility_focus_ring_controller_impl.h", "accessibility/accessibility_focus_ring_group.cc", "accessibility/accessibility_focus_ring_group.h", "accessibility/accessibility_focus_ring_layer.cc", @@ -158,6 +160,17 @@ component("ash") { "accessibility/touch_exploration_controller.h", "accessibility/touch_exploration_manager.cc", "accessibility/touch_exploration_manager.h", + "ambient/ambient_controller.cc", + "ambient/ambient_controller.h", + "ambient/model/photo_model.cc", + "ambient/model/photo_model.h", + "ambient/model/photo_model_observer.h", + "ambient/ui/ambient_container_view.cc", + "ambient/ui/ambient_container_view.h", + "ambient/ui/photo_view.cc", + "ambient/ui/photo_view.h", + "ambient/util/ambient_util.cc", + "ambient/util/ambient_util.h", "animation/animation_change_type.h", "app_list/app_list_controller_impl.cc", "app_list/app_list_controller_observer.h", @@ -177,8 +190,13 @@ component("ash") { "assistant/assistant_interaction_controller.h", "assistant/assistant_notification_controller.cc", "assistant/assistant_notification_controller.h", + "assistant/assistant_notification_expiry_monitor.cc", + "assistant/assistant_notification_expiry_monitor.h", + "assistant/assistant_prefs_controller.cc", + "assistant/assistant_prefs_controller.h", "assistant/assistant_screen_context_controller.cc", "assistant/assistant_screen_context_controller.h", + "assistant/assistant_settings.cc", "assistant/assistant_setup_controller.cc", "assistant/assistant_setup_controller.h", "assistant/assistant_ui_controller.cc", @@ -191,6 +209,8 @@ component("ash") { "autoclick/autoclick_drag_event_rewriter.h", "autoclick/autoclick_ring_handler.cc", "autoclick/autoclick_ring_handler.h", + "autoclick/autoclick_scroll_position_handler.cc", + "autoclick/autoclick_scroll_position_handler.h", "bluetooth_devices_observer.cc", "bluetooth_devices_observer.h", "cancel_mode.cc", @@ -203,6 +223,8 @@ component("ash") { "dbus/ash_dbus_services.h", "dbus/display_service_provider.cc", "dbus/display_service_provider.h", + "dbus/gesture_properties_service_provider.cc", + "dbus/gesture_properties_service_provider.h", "dbus/liveness_service_provider.cc", "dbus/liveness_service_provider.h", "dbus/url_handler_service_provider.cc", @@ -247,6 +269,8 @@ component("ash") { "display/mouse_warp_controller.h", "display/null_mouse_warp_controller.cc", "display/null_mouse_warp_controller.h", + "display/output_protection_delegate.cc", + "display/output_protection_delegate.h", "display/overscan_calibrator.cc", "display/overscan_calibrator.h", "display/persistent_window_controller.cc", @@ -280,7 +304,7 @@ component("ash") { "drag_drop/drag_drop_tracker.h", "drag_drop/drag_image_view.cc", "drag_drop/drag_image_view.h", - "events/event_rewriter_controller.cc", + "events/event_rewriter_controller_impl.cc", "events/keyboard_driven_event_rewriter.cc", "events/keyboard_driven_event_rewriter.h", "events/select_to_speak_event_handler.cc", @@ -337,19 +361,14 @@ component("ash") { "ime/ime_switch_type.h", "ime/mode_indicator_observer.cc", "ime/mode_indicator_observer.h", - "keyboard/ash_keyboard_controller.cc", - "keyboard/ash_keyboard_controller.h", + "keyboard/keyboard_controller_impl.cc", + "keyboard/keyboard_controller_impl.h", "keyboard/keyboard_util.cc", "keyboard/keyboard_util.h", "keyboard/virtual_keyboard_container_layout_manager.cc", "keyboard/virtual_keyboard_container_layout_manager.h", "keyboard/virtual_keyboard_controller.cc", "keyboard/virtual_keyboard_controller.h", - "kiosk_next/kiosk_next_home_controller.cc", - "kiosk_next/kiosk_next_home_controller.h", - "kiosk_next/kiosk_next_shell_controller.cc", - "kiosk_next/kiosk_next_shell_controller.h", - "kiosk_next/kiosk_next_shell_observer.h", "laser/laser_pointer_controller.cc", "laser/laser_pointer_controller.h", "laser/laser_pointer_view.cc", @@ -389,6 +408,8 @@ component("ash") { "login/ui/lock_debug_view.h", "login/ui/lock_screen.cc", "login/ui/lock_screen.h", + "login/ui/lock_screen_media_controls_view.cc", + "login/ui/lock_screen_media_controls_view.h", "login/ui/login_auth_user_view.cc", "login/ui/login_auth_user_view.h", "login/ui/login_base_bubble_view.cc", @@ -419,6 +440,8 @@ component("ash") { "login/ui/login_user_menu_view.h", "login/ui/login_user_view.cc", "login/ui/login_user_view.h", + "login/ui/media_controls_header_view.cc", + "login/ui/media_controls_header_view.h", "login/ui/non_accessible_view.cc", "login/ui/non_accessible_view.h", "login/ui/note_action_launch_button.cc", @@ -445,22 +468,14 @@ component("ash") { "magnifier/magnifier_utils.h", "magnifier/partial_magnification_controller.cc", "magnifier/partial_magnification_controller.h", - "media/media_controller.cc", - "media/media_controller.h", - "media/media_notification_background.cc", - "media/media_notification_background.h", + "media/media_controller_impl.cc", + "media/media_controller_impl.h", "media/media_notification_constants.cc", "media/media_notification_constants.h", - "media/media_notification_container.h", "media/media_notification_container_impl.cc", "media/media_notification_container_impl.h", - "media/media_notification_controller.h", "media/media_notification_controller_impl.cc", "media/media_notification_controller_impl.h", - "media/media_notification_item.cc", - "media/media_notification_item.h", - "media/media_notification_view.cc", - "media/media_notification_view.h", "metrics/demo_session_metrics_recorder.cc", "metrics/demo_session_metrics_recorder.h", "metrics/desktop_task_switch_metric_recorder.cc", @@ -489,10 +504,20 @@ component("ash") { "multi_user/multi_user_window_manager_impl.cc", "multi_user/user_switch_animator.cc", "multi_user/user_switch_animator.h", - "network_connect_delegate_mus.cc", - "network_connect_delegate_mus.h", "policy/policy_recommendation_restorer.cc", "policy/policy_recommendation_restorer.h", + "power/fake_gatt_battery_percentage_fetcher.cc", + "power/fake_gatt_battery_percentage_fetcher.h", + "power/fake_gatt_battery_poller.cc", + "power/fake_gatt_battery_poller.h", + "power/gatt_battery_controller.cc", + "power/gatt_battery_controller.h", + "power/gatt_battery_percentage_fetcher.cc", + "power/gatt_battery_percentage_fetcher.h", + "power/gatt_battery_poller.cc", + "power/gatt_battery_poller.h", + "power/peripheral_battery_tracker.cc", + "power/peripheral_battery_tracker.h", "root_window_controller.cc", "root_window_settings.cc", "root_window_settings.h", @@ -520,21 +545,14 @@ component("ash") { "session/session_observer.h", "session/teleport_warning_dialog.cc", "session/teleport_warning_dialog.h", - "shelf/app_list_button.cc", - "shelf/app_list_button.h", - "shelf/app_list_button_controller.cc", - "shelf/app_list_button_controller.h", "shelf/assistant_overlay.cc", "shelf/assistant_overlay.h", "shelf/back_button.cc", "shelf/back_button.h", - "shelf/default_shelf_view.cc", - "shelf/default_shelf_view.h", - "shelf/home_button_delegate.cc", - "shelf/home_button_delegate.h", - "shelf/ink_drop_button_listener.h", - "shelf/kiosk_next_shelf_view.cc", - "shelf/kiosk_next_shelf_view.h", + "shelf/home_button.cc", + "shelf/home_button.h", + "shelf/home_button_controller.cc", + "shelf/home_button_controller.h", "shelf/login_shelf_view.cc", "shelf/login_shelf_view.h", "shelf/overflow_bubble.cc", @@ -551,12 +569,11 @@ component("ash") { "shelf/shelf_background_animator.cc", "shelf/shelf_background_animator.h", "shelf/shelf_background_animator_observer.h", - "shelf/shelf_bezel_event_handler.cc", - "shelf/shelf_bezel_event_handler.h", "shelf/shelf_bubble.cc", "shelf/shelf_bubble.h", "shelf/shelf_button.cc", "shelf/shelf_button.h", + "shelf/shelf_button_delegate.h", "shelf/shelf_button_pressed_metric_tracker.cc", "shelf/shelf_button_pressed_metric_tracker.h", "shelf/shelf_constants.h", @@ -566,6 +583,8 @@ component("ash") { "shelf/shelf_control_button.h", "shelf/shelf_controller.cc", "shelf/shelf_controller.h", + "shelf/shelf_focus_cycler.cc", + "shelf/shelf_focus_cycler.h", "shelf/shelf_layout_manager.cc", "shelf/shelf_layout_manager.h", "shelf/shelf_layout_manager_observer.h", @@ -592,19 +611,19 @@ component("ash") { "shelf/window_preview.cc", "shelf/window_preview.h", "shell.cc", - "shell_delegate_mash.cc", - "shell_delegate_mash.h", "shell_init_params.cc", "shell_state.cc", "shell_state.h", - "shutdown_controller.cc", - "shutdown_controller.h", + "shutdown_controller_impl.cc", + "shutdown_controller_impl.h", "shutdown_reason.cc", "shutdown_reason.h", "sticky_keys/sticky_keys_controller.cc", "sticky_keys/sticky_keys_overlay.cc", "sticky_keys/sticky_keys_overlay.h", "sticky_keys/sticky_keys_state.h", + "style/ash_color_provider.cc", + "style/ash_color_provider.h", "system/accessibility/accessibility_feature_disable_dialog.cc", "system/accessibility/accessibility_feature_disable_dialog.h", "system/accessibility/accessibility_feature_pod_controller.cc", @@ -613,6 +632,10 @@ component("ash") { "system/accessibility/autoclick_menu_bubble_controller.h", "system/accessibility/autoclick_menu_view.cc", "system/accessibility/autoclick_menu_view.h", + "system/accessibility/autoclick_scroll_bubble_controller.cc", + "system/accessibility/autoclick_scroll_bubble_controller.h", + "system/accessibility/autoclick_scroll_view.cc", + "system/accessibility/autoclick_scroll_view.h", "system/accessibility/dictation_button_tray.cc", "system/accessibility/dictation_button_tray.h", "system/accessibility/select_to_speak_tray.cc", @@ -685,8 +708,8 @@ component("ash") { "system/locale/locale_detailed_view.h", "system/locale/locale_feature_pod_controller.cc", "system/locale/locale_feature_pod_controller.h", - "system/locale/locale_update_controller.cc", - "system/locale/locale_update_controller.h", + "system/locale/locale_update_controller_impl.cc", + "system/locale/locale_update_controller_impl.h", "system/locale/unified_locale_detailed_view_controller.cc", "system/locale/unified_locale_detailed_view_controller.h", "system/message_center/arc_notification_manager_delegate_impl.cc", @@ -776,12 +799,10 @@ component("ash") { "system/network/vpn_list_view.h", "system/network/wifi_toggle_notification_controller.cc", "system/network/wifi_toggle_notification_controller.h", - "system/night_light/night_light_controller.cc", - "system/night_light/night_light_controller.h", + "system/night_light/night_light_controller_impl.cc", + "system/night_light/night_light_controller_impl.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", "system/night_light/time_of_day.h", "system/overview/overview_button_tray.cc", @@ -842,8 +863,6 @@ component("ash") { "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/tray_power.cc", @@ -882,10 +901,8 @@ component("ash") { "system/time/time_tray_item_view.h", "system/time/time_view.cc", "system/time/time_view.h", - "system/toast/toast_data.cc", - "system/toast/toast_data.h", - "system/toast/toast_manager.cc", - "system/toast/toast_manager.h", + "system/toast/toast_manager_impl.cc", + "system/toast/toast_manager_impl.h", "system/toast/toast_overlay.cc", "system/toast/toast_overlay.h", "system/tracing_notification_controller.cc", @@ -941,6 +958,8 @@ component("ash") { "system/unified/collapse_button.h", "system/unified/current_locale_view.cc", "system/unified/current_locale_view.h", + "system/unified/custom_shape_button.cc", + "system/unified/custom_shape_button.h", "system/unified/detailed_view_controller.h", "system/unified/feature_pod_button.cc", "system/unified/feature_pod_button.h", @@ -950,8 +969,8 @@ component("ash") { "system/unified/feature_pods_container_view.h", "system/unified/ime_mode_view.cc", "system/unified/ime_mode_view.h", - "system/unified/managed_device_view.cc", - "system/unified/managed_device_view.h", + "system/unified/managed_device_tray_item_view.cc", + "system/unified/managed_device_tray_item_view.h", "system/unified/notification_counter_view.cc", "system/unified/notification_counter_view.h", "system/unified/notification_hidden_view.cc", @@ -960,12 +979,16 @@ component("ash") { "system/unified/page_indicator_view.h", "system/unified/quiet_mode_feature_pod_controller.cc", "system/unified/quiet_mode_feature_pod_controller.h", + "system/unified/rounded_label_button.cc", + "system/unified/rounded_label_button.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_managed_device_view.cc", + "system/unified/unified_managed_device_view.h", "system/unified/unified_notifier_settings_controller.cc", "system/unified/unified_notifier_settings_controller.h", "system/unified/unified_slider_bubble_controller.cc", @@ -1013,8 +1036,6 @@ component("ash") { "utility/screenshot_controller.h", "utility/transformer_util.cc", "utility/transformer_util.h", - "voice_interaction/voice_interaction_controller.cc", - "voice_interaction/voice_interaction_controller.h", "wallpaper/wallpaper_base_view.cc", "wallpaper/wallpaper_base_view.h", "wallpaper/wallpaper_controller_impl.cc", @@ -1065,10 +1086,13 @@ component("ash") { "wm/desks/desk_mini_view_animations.h", "wm/desks/desk_preview_view.cc", "wm/desks/desk_preview_view.h", + "wm/desks/desks_animations.cc", + "wm/desks/desks_animations.h", "wm/desks/desks_bar_view.cc", "wm/desks/desks_bar_view.h", "wm/desks/desks_controller.cc", "wm/desks/desks_controller.h", + "wm/desks/desks_histogram_enums.h", "wm/desks/desks_util.cc", "wm/desks/desks_util.h", "wm/desks/new_desk_button.cc", @@ -1119,6 +1143,8 @@ component("ash") { "wm/overview/overview_delegate.h", "wm/overview/overview_grid.cc", "wm/overview/overview_grid.h", + "wm/overview/overview_highlight_controller.cc", + "wm/overview/overview_highlight_controller.h", "wm/overview/overview_item.cc", "wm/overview/overview_item.h", "wm/overview/overview_observer.h", @@ -1146,8 +1172,6 @@ component("ash") { "wm/resize_shadow.h", "wm/resize_shadow_controller.cc", "wm/resize_shadow_controller.h", - "wm/root_window_finder.cc", - "wm/root_window_finder.h", "wm/root_window_layout_manager.cc", "wm/root_window_layout_manager.h", "wm/screen_dimmer.cc", @@ -1187,8 +1211,6 @@ component("ash") { "wm/tablet_mode/internal_input_devices_event_blocker.h", "wm/tablet_mode/scoped_skip_user_session_blocked_check.cc", "wm/tablet_mode/scoped_skip_user_session_blocked_check.h", - "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc", - "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h", "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.cc", "wm/tablet_mode/tablet_mode_controller.cc", "wm/tablet_mode/tablet_mode_event_handler.cc", @@ -1218,8 +1240,6 @@ component("ash") { "wm/window_finder.cc", "wm/window_mirror_view.cc", "wm/window_mirror_view.h", - "wm/window_parenting_utils.cc", - "wm/window_parenting_utils.h", "wm/window_positioner.cc", "wm/window_positioning_utils.cc", "wm/window_preview_view.cc", @@ -1233,18 +1253,17 @@ component("ash") { "wm/window_transient_descendant_iterator.cc", "wm/window_transient_descendant_iterator.h", "wm/window_util.cc", + "wm/wm_default_layout_manager.cc", + "wm/wm_default_layout_manager.h", "wm/wm_event.cc", "wm/wm_shadow_controller_delegate.cc", "wm/wm_shadow_controller_delegate.h", - "wm/wm_snap_to_pixel_layout_manager.cc", - "wm/wm_snap_to_pixel_layout_manager.h", "wm/wm_window_animations.cc", "wm/wm_window_animations.h", "wm/work_area_insets.cc", "wm/work_area_insets.h", "wm/workspace/backdrop_controller.cc", "wm/workspace/backdrop_controller.h", - "wm/workspace/backdrop_delegate.h", "wm/workspace/magnetism_matcher.cc", "wm/workspace/magnetism_matcher.h", "wm/workspace/multi_window_resize_controller.cc", @@ -1272,14 +1291,13 @@ component("ash") { "//ash/resources/vector_icons", "//ash/strings", "//ash/wayland", - "//components/discardable_memory/public/interfaces", + "//components/discardable_memory/public/mojom", "//mojo/public/cpp/system", "//services/device/public/cpp/bluetooth", "//services/device/public/mojom", + "//services/media_session/public/cpp", "//services/media_session/public/mojom", "//services/service_manager/public/cpp", - "//services/ws/public/cpp/input_devices", - "//services/ws/public/mojom", "//skia", "//ui/aura", "//ui/events", @@ -1298,7 +1316,6 @@ component("ash") { "//ash/assistant/ui", "//ash/assistant/ui:constants", "//ash/assistant/util", - "//ash/autotest", "//ash/components/cursor", "//ash/components/fast_ink", "//ash/components/shortcut_viewer", @@ -1335,6 +1352,7 @@ component("ash") { # TODO(https://crbug.com/644355): Remove Shill dependencies. "//chromeos/network", "//chromeos/services/assistant/public:feature_flags", + "//chromeos/services/assistant/public/cpp:prefs", "//chromeos/services/assistant/public/mojom", "//chromeos/services/multidevice_setup/public/mojom", "//chromeos/services/network_config/public/cpp", @@ -1347,6 +1365,7 @@ component("ash") { "//components/discardable_memory/service", "//components/exo", "//components/exo/wayland", + "//components/media_message_center", "//components/onc", "//components/password_manager/core/browser:hash_password_manager", "//components/pref_registry", @@ -1370,8 +1389,6 @@ component("ash") { "//services/data_decoder/public/cpp", "//services/preferences/public/cpp", "//services/service_manager/public/cpp", - "//services/ws/public/cpp/input_devices:input_device_controller", - "//services/ws/public/mojom/input_devices", # TODO(msw): Remove this; ash should not depend on blink/webkit. "//third_party/blink/public:blink_headers", @@ -1379,6 +1396,7 @@ component("ash") { "//third_party/qcms", "//third_party/re2", "//ui/accessibility", + "//ui/accessibility:ax_enums_mojo", "//ui/base", "//ui/base:ui_data_pack", "//ui/base/ime/chromeos", @@ -1396,13 +1414,12 @@ component("ash") { "//ui/events:events_base", "//ui/events:gesture_detection", "//ui/events/devices", - "//ui/events/devices/mojo", "//ui/events/ozone:events_ozone", "//ui/message_center", "//ui/native_theme", "//ui/ozone", + "//ui/ozone/public/interfaces:gesture_properties_service", "//ui/platform_window", - "//ui/platform_window/mojo", "//ui/platform_window/stub", "//ui/snapshot", "//ui/views/window/vector_icons", @@ -1433,7 +1450,7 @@ component("ash") { ] allow_circular_includes_from = [ - "//ash/autotest", + "//ash/assistant/ui", "//components/exo", "//components/exo/wayland", ] @@ -1501,12 +1518,13 @@ static_library("ash_shell_lib_with_content") { "shell/content/client/shell_content_browser_client.h", "shell/content/client/shell_main_delegate.cc", "shell/content/client/shell_main_delegate.h", + "shell/content/client/shell_new_window_delegate.cc", + "shell/content/client/shell_new_window_delegate.h", "shell/content/embedded_browser.cc", "shell/content/embedded_browser.h", ] deps = [ - ":ash_shell_lib", ":test_support", "//ash/components/shortcut_viewer", "//ash/public/cpp", @@ -1518,13 +1536,14 @@ static_library("ash_shell_lib_with_content") { # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only. "//chromeos/audio", "//chromeos/constants", - "//chromeos/dbus", "//chromeos/dbus/biod", "//chromeos/dbus/power", + "//chromeos/services/network_config/public/cpp:manifest", + "//chromeos/services/network_config/public/cpp:test_support", "//chromeos/system", - "//components/discardable_memory/public/interfaces", + "//components/discardable_memory/public/mojom", "//components/services/font:lib", - "//components/services/font/public/interfaces", + "//components/services/font/public/mojom", "//content", "//content/shell:content_shell_lib", "//device/bluetooth", @@ -1535,19 +1554,25 @@ static_library("ash_shell_lib_with_content") { "//ui/base", "//ui/base/ime/chromeos", "//ui/base/ime/init", + "//ui/chromeos/events", "//ui/compositor", "//ui/display", "//ui/events/devices", "//ui/message_center", "//ui/views:test_support", + "//ui/views/controls/webview", "//ui/views/examples:views_examples_with_content_lib", "//ui/wm", ] + public_deps = [ + ":ash_shell_lib", + ] } copy("dbus_service_files") { sources = [ "dbus/org.chromium.DisplayService.conf", + "dbus/org.chromium.GesturePropertiesService.conf", "dbus/org.chromium.LivenessService.conf", "dbus/org.chromium.UrlHandlerService.conf", ] @@ -1574,6 +1599,7 @@ test("ash_unittests") { "accessibility/touch_accessibility_enabler_unittest.cc", "accessibility/touch_exploration_controller_unittest.cc", "accessibility/touch_exploration_manager_unittest.cc", + "ambient/ui/ambient_container_view_unittest.cc", "app_list/app_list_controller_impl_unittest.cc", "app_list/app_list_metrics_unittest.cc", "app_list/app_list_presenter_delegate_unittest.cc", @@ -1585,12 +1611,15 @@ test("ash_unittests") { "app_menu/notification_menu_view_unittest.cc", "app_menu/notification_overflow_view_unittest.cc", "assistant/assistant_controller_unittest.cc", + "assistant/assistant_notification_controller_unittest.cc", + "assistant/assistant_prefs_controller_unittest.cc", "assistant/assistant_screen_context_controller_unittest.cc", "assistant/model/assistant_query_history_unittest.cc", "assistant/ui/assistant_container_view_unittest.cc", "assistant/util/deep_link_util_unittest.cc", "autoclick/autoclick_drag_event_rewriter_unittest.cc", "autoclick/autoclick_unittest.cc", + "dbus/gesture_properties_service_provider_unittest.cc", "dbus/url_handler_service_provider_unittest.cc", "detachable_base/detachable_base_handler_unittest.cc", "detachable_base/detachable_base_notification_controller_unittest.cc", @@ -1638,14 +1667,9 @@ test("ash_unittests") { "home_screen/home_screen_controller_unittest.cc", "ime/ime_controller_unittest.cc", "keyboard/arc/arc_input_method_surface_manager_unittest.cc", - "keyboard/ash_keyboard_controller_unittest.cc", + "keyboard/keyboard_controller_impl_unittest.cc", "keyboard/virtual_keyboard_controller_unittest.cc", "keyboard/virtual_keyboard_unittest.cc", - "kiosk_next/kiosk_next_shell_controller_unittest.cc", - "kiosk_next/kiosk_next_shell_test_util.cc", - "kiosk_next/kiosk_next_shell_test_util.h", - "kiosk_next/mock_kiosk_next_shell_client.cc", - "kiosk_next/mock_kiosk_next_shell_client.h", "laser/laser_pointer_controller_unittest.cc", "laser/laser_segment_utils_unittest.cc", "lock_screen_action/lock_screen_action_background_controller_impl_unittest.cc", @@ -1657,6 +1681,7 @@ test("ash_unittests") { "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_media_controls_view_unittest.cc", "login/ui/lock_screen_sanity_unittest.cc", "login/ui/lock_window_unittest.cc", "login/ui/login_auth_user_view_unittest.cc", @@ -1683,9 +1708,7 @@ test("ash_unittests") { "magnifier/magnifier_utils_unittest.cc", "magnifier/partial_magnification_controller_unittest.cc", "media/media_controller_unittest.cc", - "media/media_notification_background_unittest.cc", "media/media_notification_controller_impl_unittest.cc", - "media/media_notification_view_unittest.cc", "metrics/demo_session_metrics_recorder_unittest.cc", "metrics/desktop_task_switch_metric_recorder_unittest.cc", "metrics/histogram_macros_unittest.cc", @@ -1697,13 +1720,16 @@ test("ash_unittests") { "metrics/user_metrics_recorder_unittest.cc", "multi_device_setup/multi_device_notification_presenter_unittest.cc", "policy/policy_recommendation_restorer_unittest.cc", + "power/gatt_battery_controller_unittest.cc", + "power/gatt_battery_percentage_fetcher_unittest.cc", + "power/gatt_battery_poller_unittest.cc", "root_window_controller_unittest.cc", "rotator/screen_rotation_animation_unittest.cc", "rotator/screen_rotation_animator_unittest.cc", "screen_util_unittest.cc", "session/session_controller_impl_unittest.cc", - "shelf/app_list_button_unittest.cc", "shelf/back_button_unittest.cc", + "shelf/home_button_unittest.cc", "shelf/login_shelf_view_unittest.cc", "shelf/shelf_application_menu_model_unittest.cc", "shelf/shelf_background_animator_unittest.cc", @@ -1726,6 +1752,7 @@ test("ash_unittests") { "system/accessibility/dictation_button_tray_unittest.cc", "system/accessibility/select_to_speak_tray_unittest.cc", "system/accessibility/tray_accessibility_unittest.cc", + "system/bluetooth/bluetooth_notification_controller_unittest.cc", "system/bluetooth/bluetooth_power_controller_unittest.cc", "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc", "system/caps_lock_notification_controller_unittest.cc", @@ -1767,7 +1794,6 @@ test("ash_unittests") { "system/power/power_notification_controller_unittest.cc", "system/power/power_prefs_unittest.cc", "system/power/power_status_unittest.cc", - "system/power/power_status_view_unittest.cc", "system/power/video_activity_notifier_unittest.cc", "system/rotation/rotation_lock_feature_pod_controller_unittest.cc", "system/screen_layout_observer_unittest.cc", @@ -1788,6 +1814,7 @@ test("ash_unittests") { "system/unified/page_indicator_view_unittest.cc", "system/unified/quiet_mode_feature_pod_controller_unittest.cc", "system/unified/top_shortcuts_view_unittest.cc", + "system/unified/unified_managed_device_view_unittest.cc", "system/unified/unified_system_info_view_unittest.cc", "system/unified/unified_system_tray_controller_unittest.cc", "system/unified/unified_system_tray_unittest.cc", @@ -1803,7 +1830,6 @@ test("ash_unittests") { "tray_action/test_tray_action_client.h", "tray_action/tray_action_unittest.cc", "utility/screenshot_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", @@ -1833,7 +1859,10 @@ test("ash_unittests") { "wm/overview/delayed_animation_observer_impl_unittest.cc", "wm/overview/overview_controller_unittest.cc", "wm/overview/overview_grid_unittest.cc", + "wm/overview/overview_highlight_controller_unittest.cc", "wm/overview/overview_session_unittest.cc", + "wm/overview/overview_test_util.cc", + "wm/overview/overview_test_util.h", "wm/overview/overview_window_drag_controller_unittest.cc", "wm/overview/scoped_overview_transform_window_unittest.cc", "wm/pip/pip_positioner_unittest.cc", @@ -1909,6 +1938,7 @@ test("ash_unittests") { "//base", "//base/test:test_support", "//chromeos:test_support", + "//chromeos/strings:strings_grit", # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only. "//chromeos/audio", @@ -1917,6 +1947,7 @@ test("ash_unittests") { "//chromeos/dbus/hammerd", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", + "//chromeos/dbus/services:test_support", # TODO(https://crbug.com/644355): Remove Shill dependencies. "//chromeos/network:test_support", @@ -1930,6 +1961,7 @@ test("ash_unittests") { "//components/arc:notification_test_support", "//components/exo", "//components/exo:test_support", + "//components/media_message_center", "//components/password_manager/core/browser:hash_password_manager", "//components/prefs:test_support", "//components/quirks", @@ -1938,15 +1970,13 @@ test("ash_unittests") { "//components/user_manager:test_support", "//device/base", "//device/bluetooth", + "//device/bluetooth:mocks", "//extensions/common:common_constants", "//mojo/core/embedder", "//net:net", "//services/device/public/cpp/bluetooth", "//services/media_session/public/cpp/test:test_support", "//services/media_session/public/mojom", - "//services/viz/public/cpp:manifest", - "//services/ws/public/cpp/input_devices:test_support", - "//services/ws/public/mojom", "//skia", "//testing/gmock", "//testing/gtest", @@ -1973,6 +2003,7 @@ test("ash_unittests") { "//ui/events:gesture_detection", "//ui/events:test_support", "//ui/events/devices", + "//ui/events/devices:test_support", "//ui/gfx", "//ui/gfx:test_support", "//ui/gfx/geometry", @@ -1980,6 +2011,7 @@ test("ash_unittests") { "//ui/message_center", "//ui/message_center:test_support", "//ui/message_center/public/cpp", + "//ui/ozone/testhelpers:mock_gesture_properties_service", "//ui/resources", "//ui/snapshot", "//ui/strings", @@ -1994,7 +2026,6 @@ test("ash_unittests") { data_deps = [ "//ash/resources:ash_test_resources_100_percent", - "//services/viz", ] data = [ @@ -2009,6 +2040,7 @@ test("ash_unittests") { ] } +# TODO(oshima): Remove or migrate to new ash_ui_perftests test("ash_perftests") { sources = [ "perftests/ash_background_filter_blur_perftest.cc", @@ -2030,6 +2062,38 @@ test("ash_perftests") { ] } +test("ash_ui_perftests") { + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + sources = [ + "perftests/overview_animations_preftest.cc", + "shell/content/test/ash_content_perf_test_launcher.cc", + "shell/content/test/ash_content_test.cc", + "shell/content/test/ash_content_test.h", + ] + + deps = [ + ":ash_shell_lib_with_content", + ":test_support", + "//ash/public/cpp", + "//base/test:test_support", + "//cc/base", + "//chromeos/constants:constants", + "//content/shell:content_shell_lib", + "//content/test:browsertest_support", + "//content/test:test_support", + "//mojo/core/embedder", + "//testing/gtest", + "//testing/perf", + "//ui/aura", + "//ui/base", + "//ui/base:test_support", + "//ui/compositor:test_support", + "//ui/events:test_support", + "//ui/gl:test_support", + ] +} + executable("ash_shell_with_content") { testonly = true sources = [ @@ -2059,6 +2123,7 @@ static_library("test_support") { "//components/exo/wayland:*", ] public = [ + "public/cpp/shelf_test_api.h", "public/cpp/system_tray_test_api.h", ] sources = [ @@ -2092,13 +2157,13 @@ static_library("test_support") { "lock_screen_action/test_lock_screen_action_background_controller.cc", "lock_screen_action/test_lock_screen_action_background_controller.h", "login/login_screen_test_api.cc", - "login/login_screen_test_api.h", "metrics/task_switch_time_tracker_test_api.cc", "metrics/task_switch_time_tracker_test_api.h", "metrics/user_metrics_recorder_test_api.cc", "metrics/user_metrics_recorder_test_api.h", "mojo_test_interface_factory.cc", "mojo_test_interface_factory.h", + "public/cpp/shelf_test_api.cc", "public/cpp/test/shell_test_api.h", "rotator/screen_rotation_animator_test_api.cc", "rotator/screen_rotation_animator_test_api.h", @@ -2110,13 +2175,15 @@ static_library("test_support") { "shelf/overflow_bubble_view_test_api.h", "shelf/shelf_button_pressed_metric_tracker_test_api.cc", "shelf/shelf_button_pressed_metric_tracker_test_api.h", - "shelf/shelf_test_api.cc", - "shelf/shelf_test_api.h", + "shelf/shelf_test_api_impl.cc", + "shelf/shelf_test_api_impl.h", "shelf/shelf_view_test_api.cc", "shelf/shelf_view_test_api.h", "shell/toplevel_window.cc", "shell/toplevel_window.h", "shell_test_api.cc", + "system/message_center/test_notifier_settings_controller.cc", + "system/message_center/test_notifier_settings_controller.h", "system/palette/palette_tray_test_api.cc", "system/palette/palette_tray_test_api.h", "system/power/power_button_controller_test_api.cc", @@ -2178,6 +2245,7 @@ static_library("test_support") { public_deps = [ "//ash", + "//dbus", "//services/service_manager/public/cpp/test:test_support", "//testing/gtest", "//third_party/blink/public:blink_headers", @@ -2218,9 +2286,6 @@ static_library("test_support") { "//components/viz/test:test_support", "//device/bluetooth", "//services/device/public/mojom", - "//services/ws/public/cpp/input_devices", - "//services/ws/public/cpp/input_devices:test_support", - "//services/ws/public/mojom", "//skia", "//testing/gtest", "//ui/accessibility", @@ -2233,6 +2298,7 @@ static_library("test_support") { "//ui/events:events_base", "//ui/events:test_support", "//ui/events/devices", + "//ui/events/devices:test_support", "//ui/gl", "//ui/gl:test_support", "//ui/message_center", diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn index be739219a34..ccc17dc0a95 100644 --- a/chromium/ash/app_list/BUILD.gn +++ b/chromium/ash/app_list/BUILD.gn @@ -66,6 +66,8 @@ component("app_list") { "views/pulsing_block_view.h", "views/remove_query_confirmation_dialog.cc", "views/remove_query_confirmation_dialog.h", + "views/result_selection_controller.cc", + "views/result_selection_controller.h", "views/search_box_view.cc", "views/search_box_view.h", "views/search_result_actions_view.cc", @@ -106,7 +108,6 @@ component("app_list") { "//ash/assistant/util", "//ash/keyboard/ui", "//ash/public/cpp/app_list/vector_icons", - "//ash/public/cpp/vector_icons", "//ash/resources/vector_icons", "//ash/strings", "//base", @@ -169,6 +170,7 @@ static_library("test_support") { "//ui/events", "//ui/gfx", "//ui/gfx/geometry", + "//ui/views", ] } @@ -206,6 +208,7 @@ test("app_list_unittests") { "views/app_list_view_unittest.cc", "views/apps_grid_view_unittest.cc", "views/folder_header_view_unittest.cc", + "views/result_selection_controller_unittest.cc", "views/search_box_view_unittest.cc", "views/search_result_answer_card_view_unittest.cc", "views/search_result_list_view_unittest.cc", diff --git a/chromium/ash/app_list/presenter/BUILD.gn b/chromium/ash/app_list/presenter/BUILD.gn index 81a57f7c28e..8d1a3b46e87 100644 --- a/chromium/ash/app_list/presenter/BUILD.gn +++ b/chromium/ash/app_list/presenter/BUILD.gn @@ -9,7 +9,6 @@ assert(use_aura) component("presenter") { sources = [ - "app_list_presenter_delegate.cc", "app_list_presenter_delegate.h", "app_list_presenter_export.h", "app_list_presenter_impl.cc", diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn index 72483f99796..247afa9dd25 100644 --- a/chromium/ash/assistant/ui/BUILD.gn +++ b/chromium/ash/assistant/ui/BUILD.gn @@ -56,6 +56,8 @@ component("ui") { "base/assistant_button.h", "base/assistant_scroll_view.cc", "base/assistant_scroll_view.h", + "base/stack_layout.cc", + "base/stack_layout.h", "caption_bar.cc", "caption_bar.h", "dialog_plate/dialog_plate.cc", diff --git a/chromium/ash/autotest/BUILD.gn b/chromium/ash/autotest/BUILD.gn deleted file mode 100644 index 25d4d7db4e9..00000000000 --- a/chromium/ash/autotest/BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2019 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. - -# Only include files that are needed for JS autotest / integration tests. - -assert(is_chromeos) - -source_set("autotest") { - sources = [ - "shelf_integration_test_api.cc", - "shelf_integration_test_api.h", - ] - - deps = [ - "//ash/public/cpp", - "//base", - ] -} diff --git a/chromium/ash/components/shortcut_viewer/BUILD.gn b/chromium/ash/components/shortcut_viewer/BUILD.gn index 71aadd7d85e..ca115a1bfcb 100644 --- a/chromium/ash/components/shortcut_viewer/BUILD.gn +++ b/chromium/ash/components/shortcut_viewer/BUILD.gn @@ -50,10 +50,10 @@ source_set("unit_tests") { ":shortcut_viewer", "//ash:test_support", "//base/test:test_support", - "//services/ws/public/cpp/input_devices:test_support", "//testing/gtest", "//ui/compositor:test_support", "//ui/events:test_support", + "//ui/events/devices:test_support", "//ui/views", ] } diff --git a/chromium/ash/keyboard/ui/BUILD.gn b/chromium/ash/keyboard/ui/BUILD.gn index 9be75ac1350..2feedaa6009 100644 --- a/chromium/ash/keyboard/ui/BUILD.gn +++ b/chromium/ash/keyboard/ui/BUILD.gn @@ -22,9 +22,6 @@ jumbo_component("ui") { "display_util.cc", "display_util.h", "drag_descriptor.h", - "keyboard_controller.cc", - "keyboard_controller.h", - "keyboard_controller_observer.h", "keyboard_event_handler.cc", "keyboard_event_handler.h", "keyboard_export.h", @@ -33,6 +30,8 @@ jumbo_component("ui") { "keyboard_layout_manager.h", "keyboard_ui.cc", "keyboard_ui.h", + "keyboard_ui_controller.cc", + "keyboard_ui_controller.h", "keyboard_ui_factory.cc", "keyboard_ui_factory.h", "keyboard_ui_model.cc", @@ -95,6 +94,7 @@ static_library("test_support") { ] deps = [ ":ui", + "//ash/public/cpp", "//base", "//ui/aura", "//ui/aura:test_support", @@ -147,8 +147,9 @@ test("keyboard_unittests") { sources = [ "container_floating_behavior_unittest.cc", "container_full_width_behavior_unittest.cc", - "keyboard_controller_unittest.cc", "keyboard_event_handler_unittest.cc", + "keyboard_ui_controller_unittest.cc", + "keyboard_ui_model_unittest.cc", "keyboard_ukm_recorder_unittest.cc", "keyboard_util_unittest.cc", "notification_manager_unittest.cc", diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index f212569c6ac..caff4388443 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -9,6 +9,18 @@ component("cpp") { sources = [ "accelerators.cc", "accelerators.h", + "accessibility_controller.cc", + "accessibility_controller.h", + "accessibility_controller_client.h", + "accessibility_controller_enums.h", + "accessibility_focus_ring_controller.cc", + "accessibility_focus_ring_controller.h", + "accessibility_focus_ring_info.cc", + "accessibility_focus_ring_info.h", + "ambient/photo_controller.cc", + "ambient/photo_controller.h", + "android_intent_helper.cc", + "android_intent_helper.h", "app_list/app_list_client.h", "app_list/app_list_config.cc", "app_list/app_list_config.h", @@ -33,6 +45,10 @@ component("cpp") { "app_list/tokenized_string_match.h", "app_menu_constants.h", "app_types.h", + "arc_app_id_provider.cc", + "arc_app_id_provider.h", + "arc_notifications_host_initializer.cc", + "arc_notifications_host_initializer.h", "ash_constants.h", "ash_features.cc", "ash_features.h", @@ -85,11 +101,18 @@ component("cpp") { "immersive/immersive_fullscreen_controller_delegate.h", "immersive/immersive_revealed_lock.cc", "immersive/immersive_revealed_lock.h", + "keyboard/keyboard_config.h", + "keyboard/keyboard_controller.cc", + "keyboard/keyboard_controller.h", + "keyboard/keyboard_controller_observer.h", "keyboard/keyboard_switches.cc", "keyboard/keyboard_switches.h", + "keyboard/keyboard_types.h", "keyboard_shortcut_viewer.h", "kiosk_app_menu.cc", "kiosk_app_menu.h", + "locale_update_controller.cc", + "locale_update_controller.h", "lock_screen_widget_factory.cc", "lock_screen_widget_factory.h", "login_constants.h", @@ -98,16 +121,27 @@ component("cpp") { "login_screen_client.h", "login_screen_model.cc", "login_screen_model.h", + "login_screen_test_api.h", "login_types.cc", "login_types.h", + "media_client.h", + "media_controller.cc", + "media_controller.h", "network_icon_image_source.cc", "network_icon_image_source.h", "new_window_delegate.cc", "new_window_delegate.h", + "night_light_controller.cc", + "night_light_controller.h", "note_taking_client.cc", "note_taking_client.h", "notification_utils.cc", "notification_utils.h", + "notifier_metadata.cc", + "notifier_metadata.h", + "notifier_settings_controller.cc", + "notifier_settings_controller.h", + "notifier_settings_observer.h", "pagination/pagination_controller.cc", "pagination/pagination_controller.h", "pagination/pagination_model.cc", @@ -121,6 +155,8 @@ component("cpp") { "rounded_corner_decorator.h", "scale_utility.cc", "scale_utility.h", + "scoped_guest_button_blocker.h", + "select_to_speak_event_handler_delegate.h", "session/session_activation_observer.h", "session/session_controller.cc", "session/session_controller.h", @@ -142,19 +178,32 @@ component("cpp") { "shelf_types.h", "shell_window_ids.cc", "shell_window_ids.h", + "shutdown_controller.cc", + "shutdown_controller.h", "split_view.cc", "split_view.h", + "spoken_feedback_event_rewriter_delegate.h", "stylus_utils.cc", "stylus_utils.h", + "switch_access_event_handler_delegate.h", "system_tray.cc", "system_tray.h", "system_tray_client.h", "system_tray_focus_observer.h", "tablet_mode.cc", "tablet_mode.h", - "tablet_mode_toggle_observer.h", + "tablet_mode_observer.h", + "toast_data.cc", + "toast_data.h", + "toast_manager.cc", + "toast_manager.h", "touch_uma.cc", "touch_uma.h", + "update_types.h", + "view_shadow.cc", + "view_shadow.h", + "voice_interaction_controller.cc", + "voice_interaction_controller.h", "wallpaper_controller.cc", "wallpaper_controller.h", "wallpaper_controller_client.h", @@ -162,8 +211,9 @@ component("cpp") { "wallpaper_controller_observer.h", "wallpaper_info.h", "wallpaper_types.h", - "wallpaper_user_info.h", "window_animation_types.h", + "window_pin_type.cc", + "window_pin_type.h", "window_properties.cc", "window_properties.h", "window_state_type.cc", @@ -180,7 +230,6 @@ component("cpp") { "//components/sync:rest_of_sync", "//mojo/public/cpp/bindings", "//services/service_manager/public/cpp", - "//services/ws/public/mojom", "//skia/public/interfaces", "//ui/aura", "//ui/chromeos/strings", @@ -195,16 +244,14 @@ component("cpp") { ] public_deps = [ - "//ash/public/interfaces:interfaces_internal", + "//ash/public/interfaces", "//base", + "//components/arc/common:notifications", "//components/session_manager:base", "//components/user_manager", "//ui/gfx", ] - allow_circular_includes_from = - [ "//ash/public/interfaces:interfaces_internal" ] - output_name = "ash_public_cpp" } @@ -215,7 +262,7 @@ source_set("manifest") { ] deps = [ - "//ash/public/interfaces:interfaces_internal", + "//ash/public/interfaces", "//base", "//chromeos/services/multidevice_setup/public/mojom", "//chromeos/services/network_config/public/mojom", @@ -254,6 +301,8 @@ source_set("unit_tests") { "power_utils_unittest.cc", "rounded_corner_decorator_unittest.cc", "shelf_model_unittest.cc", + "view_shadow_unittest.cc", + "voice_interaction_controller_unittest.cc", ] deps = [ @@ -262,7 +311,10 @@ source_set("unit_tests") { "//base/test:test_support", "//testing/gtest", "//ui/aura:test_support", + "//ui/compositor_extra", "//ui/gfx:test_support", + "//ui/views", + "//ui/views:test_support", ] } @@ -275,6 +327,8 @@ source_set("test_support") { "test/test_keyboard_controller_observer.h", "test/test_new_window_delegate.cc", "test/test_new_window_delegate.h", + "test/test_system_tray_client.cc", + "test/test_system_tray_client.h", ] deps = [ diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn index f4c69a9d2a6..38281b020b3 100644 --- a/chromium/ash/public/cpp/vector_icons/BUILD.gn +++ b/chromium/ash/public/cpp/vector_icons/BUILD.gn @@ -9,38 +9,15 @@ aggregate_vector_icons("ash_public_vector_icons") { icon_directory = "." icons = [ - "assistant.icon", - "assistant_mic.icon", "notification_assistant.icon", - "notification_captive_portal.icon", - "notification_cellular_alert.icon", - "notification_download.icon", - "notification_end_of_support.icon", - "window_control_dezoom.icon", - "window_control_back.icon", - "window_control_menu.icon", - "window_control_zoom.icon", - "notification_family_link.icon", - "notification_google.icon", - "notification_image.icon", - "notification_installed.icon", - "notification_linux.icon", - "notification_messages.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_supervised_user.icon", - "notification_vpn.icon", "notification_warning.icon", - "notification_wifi_off.icon", + "window_control_back.icon", + "window_control_dezoom.icon", "window_control_left_snapped.icon", + "window_control_menu.icon", "window_control_right_snapped.icon", + "window_control_zoom.icon", ] } diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn index 109cda8f8d7..6f1d7f07b7c 100644 --- a/chromium/ash/public/interfaces/BUILD.gn +++ b/chromium/ash/public/interfaces/BUILD.gn @@ -4,69 +4,40 @@ import("//mojo/public/tools/bindings/mojom.gni") -# Depend upon //ash/public/cpp, which has a public_dep on this. The two targets -# must be bundled together as the typemaps depend upon //ash/public/cpp, -# and //ash/public/cpp needs to depend on this for generated code (such as -# enums and constants). -mojom("interfaces_internal") { - visibility = [ - "//ash/public/cpp:*", - "//ash/public/interfaces:test_interfaces", - ] +mojom("interfaces") { disable_variants = true sources = [ - "accessibility_controller.mojom", - "accessibility_controller_enums.mojom", - "accessibility_focus_ring_controller.mojom", - "ash_message_center_controller.mojom", "assistant_controller.mojom", "assistant_volume_control.mojom", "constants.mojom", "cros_display_config.mojom", - "event_rewriter_controller.mojom", "ime_controller.mojom", "ime_info.mojom", - "keyboard_config.mojom", - "keyboard_controller.mojom", - "keyboard_controller_types.mojom", - "kiosk_next_shell.mojom", - "locale.mojom", - "media.mojom", - "night_light_controller.mojom", - "shelf_integration_test_api.mojom", - "shutdown.mojom", "tray_action.mojom", - "update.mojom", "voice_interaction_controller.mojom", "vpn_list.mojom", - "window_pin_type.mojom", - "window_properties.mojom", ] public_deps = [ - "//chromeos/components/proximity_auth/public/interfaces", + "//chromeos/components/proximity_auth/public/mojom", "//chromeos/services/assistant/public/mojom", - "//components/account_id/interfaces", - "//components/arc/common:notifications", - "//components/sync/mojo:interfaces", + "//components/account_id/mojom", + "//components/sync/mojom", "//mojo/public/mojom/base", "//services/content/public/mojom", "//services/preferences/public/mojom", "//skia/public/interfaces", - "//ui/accessibility:ax_enums_mojo", "//ui/base/ime/chromeos/public/interfaces", - "//ui/base/mojo", - "//ui/display/mojo:interfaces", - "//ui/events/mojo:interfaces", + "//ui/base/mojom", + "//ui/display/mojom:mojom", "//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" + component_output_prefix = "ash_public_interfaces" export_class_attribute = "ASH_PUBLIC_EXPORT" export_define = "ASH_PUBLIC_IMPLEMENTATION=1" export_header = "ash/public/cpp/ash_public_export.h" @@ -76,13 +47,11 @@ mojom("test_interfaces") { testonly = true disable_variants = true sources = [ - "login_screen_test_api.test-mojom", - "shelf_test_api.test-mojom", "status_area_widget_test_api.test-mojom", ] deps = [ - "//ash/public/interfaces:interfaces_internal", - "//components/account_id/interfaces", + ":interfaces", + "//components/account_id/mojom", "//mojo/public/mojom/base", "//ui/gfx/geometry/mojo", ] diff --git a/chromium/ash/public/interfaces/accessibility_controller.mojom b/chromium/ash/public/interfaces/accessibility_controller.mojom deleted file mode 100644 index 222ba803621..00000000000 --- a/chromium/ash/public/interfaces/accessibility_controller.mojom +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright 2017 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 "ash/public/interfaces/accessibility_controller_enums.mojom"; -import "mojo/public/mojom/base/string16.mojom"; -import "mojo/public/mojom/base/time.mojom"; -import "ui/accessibility/ax_enums.mojom"; -import "ui/events/mojo/event.mojom"; -import "ui/gfx/geometry/mojo/geometry.mojom"; - -// Allows a client to implement Select-to-Speak. -// TODO(katie): Consider combining DispatchMouseEvent and DispatchKeyEvent -// into a single DispatchEvent function. -interface SelectToSpeakEventHandlerDelegate { - // Sends a KeyEvent to the Select-to-Speak extension in Chrome. The event - // is cast to a key event with a type CHECK. - DispatchKeyEvent(ui.mojom.Event event); - - // Sends a MouseEvent to the Select-to-Speak extension in Chrome. The event - // is cast to a mouse event with a type CHECK. - DispatchMouseEvent(ui.mojom.Event event); -}; - -// Allows a client to implement Switch Access. -interface SwitchAccessEventHandlerDelegate { - // Sends a KeyEvent to the Switch Access extension in Chrome. The event - // is cast to a key event with a type CHECK. - DispatchKeyEvent(ui.mojom.Event event); -}; - -// Interface for ash client (e.g. Chrome) to control and query accessibility -// features. -interface AccessibilityController { - // Sets the client interface. - SetClient(AccessibilityControllerClient client); - - // Starts or stops darkening the screen (e.g. to allow chrome a11y extensions - // to darken the screen). - SetDarkenScreen(bool darken); - - // Called when braille display state is changed. - BrailleDisplayStateChanged(bool connected); - - // Sets the focus highlight rect using |bounds_in_screen|. Called when focus - // changed in page and a11y focus highlight feature is enabled. - SetFocusHighlightRect(gfx.mojom.Rect bounds_in_screen); - - // Sets the text input caret bounds used to draw the caret highlight effect. - // For effciency, only sent when the caret highlight feature is enabled. - // Setting off-screen or empty bounds suppresses the highlight. - SetCaretBounds(gfx.mojom.Rect bounds_in_screen); - - // Sets whether the accessibility panel should always be visible, regardless - // of whether the window is fullscreen. - SetAccessibilityPanelAlwaysVisible(bool always_visible); - - // Sets the bounds for the accessibility panel. Overrides current - // configuration (i.e. fullscreen, full-width). - SetAccessibilityPanelBounds(gfx.mojom.Rect bounds, - AccessibilityPanelState state); - - // Sets the current Select-to-Speak state. This should be used by the Select- - // to-Speak extension to inform ash of its updated state. - SetSelectToSpeakState(SelectToSpeakState state); - - // Set the delegate used by the Select-to-Speak event handler. - SetSelectToSpeakEventHandlerDelegate( - SelectToSpeakEventHandlerDelegate delegate); - - // Sets the key codes that Switch Access should capture. - SetSwitchAccessKeysToCapture(array<int32> keys_to_capture); - - // Set the delegate used by the Switch Access event handler. - SetSwitchAccessEventHandlerDelegate( - SwitchAccessEventHandlerDelegate delegate); - - // Starts or stops dictation. Records metrics for toggling via SwitchAccess. - ToggleDictationFromSource(DictationToggleSource source); - - // Tells the Switch Access Event Handler whether to forward all key events to - // the Switch Access extension. - ForwardKeyEventsToSwitchAccess(bool should_forward); - - // Retrieves a string description of the current battery status. - GetBatteryDescription() - => (mojo_base.mojom.String16 battery_description); - - // Shows or hides the virtual keyboard. - SetVirtualKeyboardVisible(bool is_visible); -}; - -// Interface for ash to request accessibility service from its client (e.g. -// Chrome). -interface AccessibilityControllerClient { - // Triggers an accessibility alert to give the user feedback. - TriggerAccessibilityAlert(AccessibilityAlert alert); - - // Plays an earcon. Earcons are brief and distinctive sounds that indicate - // that their mapped event has occurred. The |sound_key| enums can be found in - // chromeos/audio/chromeos_sounds.h. This method exists because the browser - // owns all media playback. - PlayEarcon(int32 sound_key); - - // Initiates play of shutdown sound and returns sound duration. This method - // exists because the browser owns all media playback. - PlayShutdownSound() => (mojo_base.mojom.TimeDelta sound_duration); - - // Forwards an accessibility gesture from the touch exploration controller to - // ChromeVox. - HandleAccessibilityGesture(ax.mojom.Gesture gesture); - - // Starts or stops dictation (type what you speak). - // Returns the new dictation state after the toggle. - ToggleDictation() => (bool dictation_on); - - // Cancels all current and queued speech immediately. - SilenceSpokenFeedback(); - - // Called when we first detect two fingers are held down, which can be used to - // toggle spoken feedback on some touch-only devices. - OnTwoFingerTouchStart(); - - // Called when the user is no longer holding down two fingers (including - // releasing one, holding down three, or moving them). - OnTwoFingerTouchStop(); - - // Whether or not to enable toggling spoken feedback via holding down two - // fingers on the screen. - ShouldToggleSpokenFeedbackViaTouch() => (bool should_toggle); - - // Plays tick sound indicating spoken feedback will be toggled after - // countdown. - PlaySpokenFeedbackToggleCountdown(int32 tick_count); - - // Requests the Select-to-Speak extension to change its state. This lets users - // do the same things in tablet mode as with a keyboard. Specifically, if - // Select-to-Speak is not speaking, move to capturing state; if - // Select-to-Speak is speaking, cancel speaking and move to inactive state. - RequestSelectToSpeakStateChange(); -}; diff --git a/chromium/ash/public/interfaces/accessibility_controller_enums.mojom b/chromium/ash/public/interfaces/accessibility_controller_enums.mojom deleted file mode 100644 index 9c23483a488..00000000000 --- a/chromium/ash/public/interfaces/accessibility_controller_enums.mojom +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2019 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; - -// Alert sent to the accessibility api. -enum AccessibilityAlert { - // Default value, indicates no accessibility alert. - NONE, - - // When caps lock is turned on. - CAPS_ON, - - // When caps lock is turned off. - CAPS_OFF, - - // When screen is turned on by tablet power button. - SCREEN_ON, - - // When screen is turned off by tablet power button. - SCREEN_OFF, - - // When window moved to another display by accelerators. - WINDOW_MOVED_TO_ANOTHER_DISPLAY, - - // When the user attempts a keyboard command that requires a window to work, - // and none is available. - WINDOW_NEEDED, - - // When the user enters window overview mode. - WINDOW_OVERVIEW_MODE_ENTERED, - - // When workspace state just changed to WORKSPACE_WINDOW_STATE_FULL_SCREEN. - WORKSPACE_FULLSCREEN_STATE_ENTERED, - - // When workspace state just changed from WORKSPACE_WINDOW_STATE_FULL_SCREEN - // to others. - WORKSPACE_FULLSCREEN_STATE_EXITED -}; - -enum AccessibilityPanelState { - // Window bounds are set explicitly. - BOUNDED, - - // Width of panel matches screen width, y_coord and height are set by bounds. - FULL_WIDTH, - - // Panel occupies the full screen. Bounds are ignored. - FULLSCREEN -}; - -// These values are persisted to logs and should not be renumbered or re-used. -// See tools/metrics/histograms/enums.xml. -enum DictationToggleSource { - // Toggled by the keyboard command (Search + D). - kKeyboard, - - // Toggled by the dictation button in the tray. - kButton, - - // Switch Access context menu button. - kSwitchAccess, - - // Chromevox chrome extension. - kChromevox -}; - -enum SelectToSpeakState { - // Select to Speak is not actively selecting text or speaking. - kSelectToSpeakStateInactive, - - // Select to Speak is being used to actively select a new region. Note that - // it might also be speaking, but the selecting state takes precedence. - kSelectToSpeakStateSelecting, - - // Select to Speak is currently speaking. - kSelectToSpeakStateSpeaking, -}; - -// The type of mouse event the Automatic Clicks feature should perform when -// dwelling. These values are written to prefs and correspond to -// AutoclickActionType in enums.xml, so should not be changed. New values -// should be added at the end. -enum AutoclickEventType { - // Perform a left click. - kLeftClick, - - // Perform a right click. - kRightClick, - - // Perform a drag and drop, i.e. click down at the first dwell, and up at the - // second dwell. - kDragAndDrop, - - // Perform a double-click. - kDoubleClick, - - // A non-action, i.e. nothing will happen at the end of the dwell time. - kNoAction, - - // TODO(katie): Add scroll. -}; - -// The Automatic Clicks feature's on-screen menu display location. These values -// are written to prefs so they should not be changed. New values should be -// added at the end. -enum AutoclickMenuPosition { - // The bottom right of the screen. - kBottomRight, - - // The bottom left of the screen. - kBottomLeft, - - // The top left of the screen. - kTopLeft, - - // The top right of the screen. - kTopRight, - - // The default position. This will be either the bottom right in LTR languages - // or the bottom right in RTL languages. Once the user explicitly picks - // a position it will no longer change with language direction. - kSystemDefault, -}; diff --git a/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom b/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom deleted file mode 100644 index 91cf8e0b684..00000000000 --- a/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom +++ /dev/null @@ -1,50 +0,0 @@ -// 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 }; - -enum FocusRingType { GLOW, SOLID, DASHED }; - -// Defines a specific focus ring by specifying: -// - |rects_in_screen| the regions around which to draw the focus ring (in -// screen coordinates). -// - |focus_ring_behavior| whether it should persist or fade. -// - |focus_ring_type| the visual style of the focus ring. -// - |color| the color of the focus ring. -// - |secondary_color| a secondary color, used by some visual styles. The -// default value is SK_ColorTRANSPARENT. -struct FocusRing { - array<gfx.mojom.Rect> rects_in_screen; - FocusRingBehavior behavior; - FocusRingType type; - uint32 color; - uint32 secondary_color = 0; // SK_ColorTRANSPARENT -}; - - -// Interface for ash client (e.g. Chrome) to control and query accessibility -// focus ring features. -interface AccessibilityFocusRingController { - // Sets the focus ring with the given ID to the specifications of focus_ring. - SetFocusRing(string focus_ring_id, FocusRing focus_ring); - - // Hides focus ring on screen with the given ID. - HideFocusRing(string focus_ring_id); - - // 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. - // TODO(katie): Add |caller_id| to highlights as well if other Accessibility - // tools or extensions want to use this API. - SetHighlights(array<gfx.mojom.Rect> rects_in_screen, uint32 skcolor); - - // Hides highlight on screen. - // TODO(katie): Add |caller_id| to highlights as well. - HideHighlights(); -}; diff --git a/chromium/ash/public/interfaces/ash_message_center_controller.mojom b/chromium/ash/public/interfaces/ash_message_center_controller.mojom deleted file mode 100644 index a17e5e9645a..00000000000 --- a/chromium/ash/public/interfaces/ash_message_center_controller.mojom +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright 2017 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 "components/arc/common/notifications.mojom"; -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. -struct NotifierUiData { - // The notifier (e.g. an extension). - message_center.mojom.NotifierId notifier_id; - - // The user-visible name of the notifier (e.g. an extension's name). - mojo_base.mojom.String16 name; - - // True if notifications from the notifier are presently enabled. - bool enabled; - - // True if the setting is enforced by administrator and the user can't change. - bool enforced; - - // An icon displayed next to the name. - gfx.mojom.ImageSkia? icon; -}; - -// The message center controller funnels notification requests from the client -// to the MessageCenter. -interface AshMessageCenterController { - SetClient(associated AshMessageCenterClient client); - - // Sets the ARC notification instance. - SetArcNotificationsInstance(arc.mojom.NotificationsInstance instance); - - // 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, - gfx.mojom.ImageSkia icon); - - 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); - - // Changes the quiet mode state in the message center. - SetQuietMode(bool enabled); -}; - -// The message center client interface mimics -// message_center::NotificationDelegate. The ID strings match the id passed in -// |notification| in ShowClientNotification and the format of the ID is up to -// the client. -interface AshMessageCenterClient { - // Called when a notification previously displayed by the client is closed. - HandleNotificationClosed(mojo_base.mojom.UnguessableToken display_token, - bool by_user); - - // Called when the body of a notification is clicked. - HandleNotificationClicked(string id); - - // Called when a notification that has buttons (e.g., "Learn more") receives a - // click on one of the buttons. |reply| is a user-provided string for cases - // where the button had a text input field attached to it. - HandleNotificationButtonClicked(string id, int32 button_index, - mojo_base.mojom.String16? reply); - - // Called when a notification's settings button has been pressed (and the - // handler is SettingsButtonHandler::DELEGATE). - HandleNotificationSettingsButtonClicked(string id); - - // Called when a notification has been disabled (via inline settings). - DisableNotification(string id); - - // Called when a user enables or disables notifications from the given - // notifier. - SetNotifierEnabled(message_center.mojom.NotifierId notifier_id, bool enabled); - - // Asks the client for a list of notifiers and associated UI information to be - // displayed in a settings panel. - GetNotifierList() => (array<NotifierUiData> notifiers); - - // Gets ARC app id from a given package name. - GetArcAppIdByPackageName(string package_name) => (string app_id); - - // Show the lockscreen notification setting on the Chrome OS setting. - ShowLockScreenNotificationSettings(); -}; diff --git a/chromium/ash/public/interfaces/assistant_controller.mojom b/chromium/ash/public/interfaces/assistant_controller.mojom index d90a08fceab..707aee49e66 100644 --- a/chromium/ash/public/interfaces/assistant_controller.mojom +++ b/chromium/ash/public/interfaces/assistant_controller.mojom @@ -10,15 +10,11 @@ import "mojo/public/mojom/base/time.mojom"; // Interface to AssistantController which is owned by Shell in Ash. This is // typically used by the Assistant service to provide the controller with an -// interface to itself, as well as by the Assistant client in chrome/browser to -// provide interfaces to delegates which depend on browser. +// interface to itself. interface AssistantController { // Provides a reference to the underlying |assistant| service. SetAssistant(chromeos.assistant.mojom.Assistant assistant); - // Opens Google Assistant settings. - OpenAssistantSettings(); - // Show speaker id enrollment flow. StartSpeakerIdEnrollmentFlow(); @@ -29,9 +25,6 @@ interface AssistantController { bool pii_allowed, string feedback_description, string screenshot_png); - - // Provides a reference to DeviceActions service. - SetDeviceActions(chromeos.assistant.mojom.DeviceActions device_actions); }; enum AssistantTimerState { @@ -112,6 +105,9 @@ interface AssistantNotificationController { // Requests that all notifications be removed. If |from_server| is true the // request was initiated by the server. RemoveAllNotifications(bool from_server); + + // Changes the quiet mode state in the message center. + SetQuietMode(bool enabled); }; // Interface to the AssistantScreenContextController which is owned by the diff --git a/chromium/ash/public/interfaces/cros_display_config.mojom b/chromium/ash/public/interfaces/cros_display_config.mojom index ac2899a15f7..5be4f56fe11 100644 --- a/chromium/ash/public/interfaces/cros_display_config.mojom +++ b/chromium/ash/public/interfaces/cros_display_config.mojom @@ -5,7 +5,7 @@ module ash.mojom; import "ui/gfx/geometry/mojo/geometry.mojom"; -import "ui/display/mojo/display.mojom"; +import "ui/display/mojom/display.mojom"; // All points, bounds, and insets are in display pixels unless otherwise // sepcified. diff --git a/chromium/ash/public/interfaces/event_rewriter_controller.mojom b/chromium/ash/public/interfaces/event_rewriter_controller.mojom deleted file mode 100644 index 09b3de1503e..00000000000 --- a/chromium/ash/public/interfaces/event_rewriter_controller.mojom +++ /dev/null @@ -1,43 +0,0 @@ -// 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/events/mojo/event.mojom"; - -// Allows a client to implement spoken feedback features; used for ChromeVox. -interface SpokenFeedbackEventRewriterDelegate { - // Used to send key events to the ChromeVox extension. |capture| is true if - // the rewriter discarded the event, false if the rewriter continues event - // propagation. - DispatchKeyEventToChromeVox(ui.mojom.Event event, bool capture); - - // Used to send mouse events to the ChromeVox extension. - DispatchMouseEventToChromeVox(ui.mojom.Event event); -}; - -// Allows clients to toggle some event rewriting behavior. -interface EventRewriterController { - // Enables the KeyboardDrivenEventRewriter, which is disabled by default. - // This only applies when the user is on the login screen. - SetKeyboardDrivenEventRewriterEnabled(bool enabled); - - // If true, Shift + Arrow keys are rewritten to Tab/Shift-Tab keys. - // This only applies when the KeyboardDrivenEventRewriter is active. - SetArrowToTabRewritingEnabled(bool enabled); - - // Set the delegate used by the spoken feedback event rewriter. - SetSpokenFeedbackEventRewriterDelegate( - SpokenFeedbackEventRewriterDelegate delegate); - - // Continue dispatch of key events that were unhandled by ChromeVox. - // TODO(crbug.com/839541): ChromeVox should not repost unhandled events. - OnUnhandledSpokenFeedbackEvent(ui.mojom.Event event); - - // Discards key events and sends to spoken feedback when true. - CaptureAllKeysForSpokenFeedback(bool capture); - - // Sends mouse events to ChromeVox when true. - SetSendMouseEventsToDelegate(bool value); -}; diff --git a/chromium/ash/public/interfaces/keyboard_config.mojom b/chromium/ash/public/interfaces/keyboard_config.mojom deleted file mode 100644 index 737671d8a48..00000000000 --- a/chromium/ash/public/interfaces/keyboard_config.mojom +++ /dev/null @@ -1,40 +0,0 @@ -// 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 keyboard.mojom; - -// Determines how the keyboard overscroll enabled state is set. -enum KeyboardOverscrollBehavior { - // Use the default behavior. - kDefault, - - // Enable keyboard overscroll if allowed. - kEnabled, - - // Do not enable keyboard overscroll. - kDisabled, -}; - -struct KeyboardConfig { - // Whether the virtual keyboard can provide auto-complete. - bool auto_complete = true; - - // Whether the virtual keyboard can provide auto-correct. - bool auto_correct = true; - - // Whether the virtual keyboard can provide auto-capitalization. - bool auto_capitalize = true; - - // Whether the virtual keyboard can provide input via handwriting recognition. - bool handwriting = true; - - // Whether the virtual keyboard can provide spell-check. - bool spell_check = true; - - // Whether the virtual keyboard can provide voice input. - bool voice_input = true; - - // Whether overscroll is currently allowed by the active keyboard container. - KeyboardOverscrollBehavior overscroll_behavior = kDefault; -}; diff --git a/chromium/ash/public/interfaces/keyboard_controller.mojom b/chromium/ash/public/interfaces/keyboard_controller.mojom deleted file mode 100644 index a27418c19a9..00000000000 --- a/chromium/ash/public/interfaces/keyboard_controller.mojom +++ /dev/null @@ -1,119 +0,0 @@ -// 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 "ash/public/interfaces/keyboard_config.mojom"; -import "ash/public/interfaces/keyboard_controller_types.mojom"; -import "ui/gfx/geometry/mojo/geometry.mojom"; - -enum HideReason { - // Hide requested by an explicit user action. - kUser, - - // Hide requested due to a system event (e.g. because it would interfere with - // a menu or other on screen UI). - kSystem, -}; - -interface KeyboardControllerObserver { - // Called when a keyboard enable flag changes. - OnKeyboardEnableFlagsChanged(array<keyboard.mojom.KeyboardEnableFlag> flags); - - // Called when the keyboard is enabled or disabled. If ReloadKeyboard() is - // called or other code enables the keyboard while already enabled, this will - // be called twice, once when the keyboard is disabled and again when it is - // re-enabled. - OnKeyboardEnabledChanged(bool is_enabled); - - // Called when the virtual keyboard configuration changes. - OnKeyboardConfigChanged(keyboard.mojom.KeyboardConfig config); - - // Called when the visibility of the virtual keyboard changes, e.g. an input - // field is focused or blurred, or the user hides the keyboard. - OnKeyboardVisibilityChanged(bool visible); - - // Called when the keyboard bounds change. |screen_bounds| is in screen - // coordinates. - OnKeyboardVisibleBoundsChanged(gfx.mojom.Rect screen_bounds); - - // Called when the keyboard occluded bounds change. |screen_bounds| is in - // screen coordinates. - OnKeyboardOccludedBoundsChanged(gfx.mojom.Rect screen_bounds); - - // Signals a request to load the keyboard contents. If the contents are - // already loaded, requests a reload. Once the contents have loaded, - // KeyboardController.KeyboardContentsLoaded is expected to be called by the - // client implementation. - OnLoadKeyboardContentsRequested(); - - // Called when the UI has been destroyed so that the client can reset the - // embedded contents and handle. - OnKeyboardUIDestroyed(); -}; - -interface KeyboardController { - // Informs the controller that the keyboard contents have loaded. - KeyboardContentsLoaded(gfx.mojom.Size size); - - // Retrieves the current keyboard configuration. - GetKeyboardConfig() => (keyboard.mojom.KeyboardConfig config); - - // Sets the current keyboard configuration. - SetKeyboardConfig(keyboard.mojom.KeyboardConfig config); - - // Returns whether the virtual keyboard has been enabled. - IsKeyboardEnabled() => (bool enabled); - - // Sets the provided keyboard enable flag. If the computed enabled state - // changes, enables or disables the keyboard to match the new state. - SetEnableFlag(keyboard.mojom.KeyboardEnableFlag flag); - - // Clears the provided keyboard enable flag. If the computed enabled state - // changes, enables or disables the keyboard to match the new state. - ClearEnableFlag(keyboard.mojom.KeyboardEnableFlag flag); - - // Gets the current set of keyboard enable flags. - GetEnableFlags() => (array<keyboard.mojom.KeyboardEnableFlag> flags); - - // Reloads the virtual keyboard if it is enabled and the URL has changed, e.g. - // the focus has switched from one type of field to another. - ReloadKeyboardIfNeeded(); - - // Rebuilds (disables and re-enables) the virtual keyboard if it is enabled. - // This is used to force a reload of the virtual keyboard when preferences or - // other configuration that affects loading the keyboard may have changed. - RebuildKeyboardIfEnabled(); - - // Returns whether the virtual keyboard is visible. - IsKeyboardVisible() => (bool visible); - - // Shows the virtual keyboard on the current display if it is enabled. - ShowKeyboard(); - - // Hides the virtual keyboard if it is visible. - HideKeyboard(HideReason reason); - - // Sets the keyboard container type. If non empty, |target_bounds| provides - // the container size. Returns whether the transition succeeded once the - // container type changes (or fails to change). - SetContainerType(keyboard.mojom.ContainerType container_type, - gfx.mojom.Rect? target_bounds) => (bool result); - - // If |locked| is true, the keyboard remains visible even when no window has - // input focus. - SetKeyboardLocked(bool locked); - - // Sets the regions of the keyboard window that occlude whatever is behind it. - SetOccludedBounds(array<gfx.mojom.Rect> bounds); - - // Sets the regions of the keyboard window where events should be handled. - SetHitTestBounds(array<gfx.mojom.Rect> bounds); - - // Sets the region of the keyboard window that can be used as a drag handle. - SetDraggableArea(gfx.mojom.Rect bounds); - - // Adds a KeyboardControllerObserver. - AddObserver(associated KeyboardControllerObserver observer); -}; diff --git a/chromium/ash/public/interfaces/keyboard_controller_types.mojom b/chromium/ash/public/interfaces/keyboard_controller_types.mojom deleted file mode 100644 index dfa41cfa806..00000000000 --- a/chromium/ash/public/interfaces/keyboard_controller_types.mojom +++ /dev/null @@ -1,52 +0,0 @@ -// 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 keyboard.mojom; - -// Flags that affect whether or not the virtual keyboard should be enabled. -// Enabled/Disabled flag pairs are mutually exclusive, but flags from multiple -// sources may be set. Precedence is determined by the implementation in -// KeyboardController::IsKeyboardEnableRequested. -enum KeyboardEnableFlag { - // Enabled by policy. - kPolicyEnabled, - - // Disabled by policy. - kPolicyDisabled, - - // Disabled by the Android keyboard. - kAndroidDisabled, - - // Enabled by a first-party extension. - kExtensionEnabled, - - // Disabled by a first-party extension. - kExtensionDisabled, - - // Enabled by an a11y controller. - kAccessibilityEnabled, - - // Enabled by the shelf/launcher controller. - kShelfEnabled, - - // Enabled by the touch controller. - kTouchEnabled, - - // Enabled via the "--enable-virtual-keyboard" command line switch. - // Used for development and debugging. - kCommandLineEnabled, -}; - -// Container types used to set and identify container behavior. Used in UMA -// stats gathering, so values should never be changed or reused. -enum ContainerType { - // Corresponds to a ContainerFullWidthBehavior. - kFullWidth = 0, - - // Corresponds to a ContainerFloatingBehavior. - kFloating = 1, - - // Corresponds to a ContainerFullscreenBehavior. - // kFullscreen = 2, // Deprecated; feature was abandoned. -}; diff --git a/chromium/ash/public/interfaces/kiosk_next_shell.mojom b/chromium/ash/public/interfaces/kiosk_next_shell.mojom deleted file mode 100644 index a9ec5d2e8bf..00000000000 --- a/chromium/ash/public/interfaces/kiosk_next_shell.mojom +++ /dev/null @@ -1,21 +0,0 @@ -// 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 "components/account_id/interfaces/account_id.mojom"; - -// Performs browser-side functionality for Kiosk Next, e.g. launching the -// KioskNextShell. -interface KioskNextShellClient { - // Launch the Kiosk Next Shell for the user identified by |account_id|. - LaunchKioskNextShell(signin.mojom.AccountId account_id); -}; - -// Allows Ash and its consumers to interact with Kiosk Next. -// These requests are forwarded to the KioskNextShellClient when necessary. -interface KioskNextShellController { - // Provides a client for dispatching requests. - SetClient(KioskNextShellClient client); -}; diff --git a/chromium/ash/public/interfaces/locale.mojom b/chromium/ash/public/interfaces/locale.mojom deleted file mode 100644 index a92a51889ca..00000000000 --- a/chromium/ash/public/interfaces/locale.mojom +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -module ash.mojom; - -import "mojo/public/mojom/base/string16.mojom"; - -// The locale info to show in the system tray locale detailed view. -struct LocaleInfo { - // This ISO code of the locale. - string iso_code; - - // The display name of the locale. - mojo_base.mojom.String16 display_name; -}; - -// Sent as the response to LocaleUpdateController.OnLocaleChanged(). -enum LocaleNotificationResult { - ACCEPT, - REVERT -}; - -// Used by Chrome to notify locale change events. -interface LocaleUpdateController { - // When this is called in OOBE, it returnes ACCEPT immediately after invoking - // observer callbacks. |current|, |from|, and |to| are ignored in this case. - // Otherwise it displays a notification in ash prompting the user whether to - // accept a change in the locale. If the user clicks the accept button (or - // closes the notification), OnLocaleChange() returns ACCEPT. If the user - // clicks the revert button, returns REVERT. - OnLocaleChanged(string current, string from, string to) - => (LocaleNotificationResult result); -}; diff --git a/chromium/ash/public/interfaces/media.mojom b/chromium/ash/public/interfaces/media.mojom deleted file mode 100644 index 14866ff1b0c..00000000000 --- a/chromium/ash/public/interfaces/media.mojom +++ /dev/null @@ -1,50 +0,0 @@ -// 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. - -module ash.mojom; - -import "components/account_id/interfaces/account_id.mojom"; - -// Describes whether media is currently being captured. -enum MediaCaptureState { - NONE = 0, - AUDIO = 1, - VIDEO = 2, - AUDIO_VIDEO = 3 -}; - -// Allows clients (e.g. Chrome browser) to interface with the ash media -// indicators. -interface MediaController { - // Sets the client interface. - SetClient(associated MediaClient client); - - // Forces media shortcut key handling in MediaClient instead of in ash. This - // defaults to false and will be reset if the client encounters an error. - SetForceMediaClientKeyHandling(bool enabled); - - // Called when the media capture state changes on the client, or in response - // to a RequestCaptureState() request. Returns a map from AccountId to - // MediaCaptureState representing every user's state. - NotifyCaptureState(map<signin.mojom.AccountId, - MediaCaptureState> capture_states); -}; - -// This delegate allows the UI code in ash to forward UI commands. -interface MediaClient { - // Handles the Next Track Media shortcut key. - HandleMediaNextTrack(); - - // Handles the Play/Pause Toggle Media shortcut key. - HandleMediaPlayPause(); - - // Handles the Previous Track Media shortcut key. - HandleMediaPrevTrack(); - - // Requests that the client resends the NotifyMediaCaptureChanged() message. - RequestCaptureState(); - - // Suspends all WebContents-associated media sessions to stop managed players. - SuspendMediaSessions(); -}; diff --git a/chromium/ash/public/interfaces/night_light_controller.mojom b/chromium/ash/public/interfaces/night_light_controller.mojom deleted file mode 100644 index ddad119494c..00000000000 --- a/chromium/ash/public/interfaces/night_light_controller.mojom +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2017 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; - -// Represents a geolocation position fix. It's "simple" because it doesn't -// expose all the parameters of the position interface as defined by the -// Geolocation API Specification: -// (https://dev.w3.org/geo/api/spec-source.html#position_interface). -// The NightLightController is only interested in valid latitude and longitude. -// It also doesn't require any specific accuracy. The more accurate the -// positions, the more accurate sunset and sunrise times calculations. However, -// an IP-based geoposition is considered good enough. -struct SimpleGeoposition { - double latitude; - double longitude; -}; - -// Used by a client (e.g. Chrome) to provide the current user's geoposition. -interface NightLightController { - // These values are written to logs. New enum values can be added, but - // existing enums must never be renumbered or deleted and reused. - enum ScheduleType { - // Automatic toggling of NightLight is turned off. - kNone = 0, - - // Turned automatically on at the user's local sunset time, and off at the - // user's local sunrise time. - kSunsetToSunrise = 1, - - // Toggled automatically based on the custom set start and end times - // selected by the user from the system settings. - kCustom = 2, - }; - - // Sets the client that will be notified of changes in the Night Light - // schedule type. - SetClient(NightLightClient client); - - // Provides the NightLightController with the user's geoposition so that it - // can calculate the sunset and sunrise times. This should only be called when - // the schedule type is set to "Sunset to Sunrise". - SetCurrentGeoposition(SimpleGeoposition position); -}; - -// Used by ash to notify a client (e.g. Chrome) of the changes in the Night -// Light schedule type. -interface NightLightClient { - // Notifies the client with the new schedule type whenever it changes. - OnScheduleTypeChanged(NightLightController.ScheduleType new_type); -}; diff --git a/chromium/ash/public/interfaces/shelf_integration_test_api.mojom b/chromium/ash/public/interfaces/shelf_integration_test_api.mojom deleted file mode 100644 index 43bf312e40e..00000000000 --- a/chromium/ash/public/interfaces/shelf_integration_test_api.mojom +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2019 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; - -// These values match ash::ShelfAutoHideBehavior. -enum ShelfAutoHideBehavior { - SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, // Always auto-hide. - SHELF_AUTO_HIDE_BEHAVIOR_NEVER, // Never auto-hide. - SHELF_AUTO_HIDE_ALWAYS_HIDDEN, // Always hide. -}; - -// These values match ash::ShelfAlignment. -enum ShelfAlignment { - SHELF_ALIGNMENT_BOTTOM, // Bottom alignment. - SHELF_ALIGNMENT_LEFT, // Left alignment. - SHELF_ALIGNMENT_RIGHT, // Right alignment. - SHELF_ALIGNMENT_BOTTOM_LOCKED, // Bottom alignment, set temporarily and not - // saved to preferences. -}; - -// Test interface used to interact with the Shelf from integration tests. -// Note this interface applies the shelf properties from the call -// arguments and might be lost if tests do something that triggers -// applying shelf properties from prefs, such as switching user, -// entering/exiting tablet mode, changing display config, etc. -interface ShelfIntegrationTestApi { - // Returns the auto hide behavior. - // |display_id| represents the display that contains the shelf. |display_id| - // must be valid. - GetAutoHideBehavior(int64 display_id) => (ShelfAutoHideBehavior behavior); - - // Sets the auto hide behavior. - // |display_id| represents the display that contains the shelf. |display_id| - // must be valid. - // |behavior| is the new behavior. - SetAutoHideBehavior(int64 display_id, ShelfAutoHideBehavior behavior) => (); - - // Sets the alignment. - // |display_id| represents the display that contains the shelf. |display_id| - // must be valid. - // |alignment| is the new alignment. - SetAlignment(int64 display_id, ShelfAlignment alignment) => (); - - // Returns the alignment. - // |display_id| represents the display that contains the shelf. |display_id| - // must be valid. - GetAlignment(int64 display_id) => (ShelfAlignment alignment); -}; diff --git a/chromium/ash/public/interfaces/shelf_integration_test_api.typemap b/chromium/ash/public/interfaces/shelf_integration_test_api.typemap deleted file mode 100644 index b0af9600948..00000000000 --- a/chromium/ash/public/interfaces/shelf_integration_test_api.typemap +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2019 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. - -mojom = "//ash/public/interfaces/shelf_integration_test_api.mojom" -public_headers = [ "//ash/public/cpp/shelf_types.h" ] -traits_headers = - [ "//ash/public/cpp/shelf_integration_test_api_struct_mojom_traits.h" ] - -type_mappings = [ - "ash.mojom.ShelfAlignment=ash::ShelfAlignment", - "ash.mojom.ShelfAutoHideBehavior=ash::ShelfAutoHideBehavior", -] diff --git a/chromium/ash/public/interfaces/shutdown.mojom b/chromium/ash/public/interfaces/shutdown.mojom deleted file mode 100644 index 11437eb195f..00000000000 --- a/chromium/ash/public/interfaces/shutdown.mojom +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -module ash.mojom; - -// Interface implemented by ash and used by chrome to provide shutdown policy -// information. Exists because device policy is owned by chrome, not ash. -interface ShutdownController { - // Sets a boolean pref that indicates whether the device automatically reboots - // when the user initiates a shutdown via an UI element. Used in enterprise - // environments for devices that should not be shut down. - SetRebootOnShutdown(bool reboot_on_shutdown); - - // Triggers an animated shutdown after the login screen shutdown button was - // pressed. - RequestShutdownFromLoginScreen(); -}; diff --git a/chromium/ash/public/interfaces/typemaps.gni b/chromium/ash/public/interfaces/typemaps.gni deleted file mode 100644 index 085a6c007f4..00000000000 --- a/chromium/ash/public/interfaces/typemaps.gni +++ /dev/null @@ -1,5 +0,0 @@ -# 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. - -typemaps = [ "//ash/public/interfaces/shelf_integration_test_api.typemap" ] diff --git a/chromium/ash/public/interfaces/update.mojom b/chromium/ash/public/interfaces/update.mojom deleted file mode 100644 index 4f914d5a0e5..00000000000 --- a/chromium/ash/public/interfaces/update.mojom +++ /dev/null @@ -1,36 +0,0 @@ -// 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. - -module ash.mojom; - -// Urgency of a pending software update. Sets the system tray update icon color. -// These correspond to values in UpgradeDetector's -// UpgradeNotificationAnnoyanceLevel enum. Their use is platform-specific. On -// Chrome OS, LOW severity is issued when an update is detected. ELEVATED -// follows after two days, and HIGH two days after that. These time deltas may -// be overridden by administrators via the RelaunchNotificationPeriod policy -// setting. -// TODO(jamescook): UpgradeDetector::UpgradeNotificationAnnoyanceLevel could be -// replaced with this if this moves into a component shared with non-ash chrome. -enum UpdateSeverity { - NONE, - VERY_LOW, - LOW, - ELEVATED, - HIGH, - CRITICAL, -}; - -// The type of update being applied. Sets the string in the system tray. -enum UpdateType { - FLASH, - SYSTEM, -}; - -// Notification style for system updates, set by different policies. -enum NotificationStyle { - DEFAULT, - ADMIN_RECOMMENDED, // Relaunch Notification policy - ADMIN_REQUIRED, // Relaunch Notification policy -}; diff --git a/chromium/ash/public/interfaces/voice_interaction_controller.mojom b/chromium/ash/public/interfaces/voice_interaction_controller.mojom index 7b3136da9e7..dd8daa3d10a 100644 --- a/chromium/ash/public/interfaces/voice_interaction_controller.mojom +++ b/chromium/ash/public/interfaces/voice_interaction_controller.mojom @@ -25,12 +25,8 @@ enum VoiceInteractionState { enum AssistantAllowedState { // Assistant feature is allowed. ALLOWED = 0, - // Disallowed because ARC++ is disallowed. There could be many specific - // reasones why ARC++ is disallowed. This enum is a catch all. Some enums - // below will show specific reasons. - DISALLOWED_BY_ARC_DISALLOWED, - // Disallowed because ARC++ is disabled by policy. - DISALLOWED_BY_ARC_POLICY, + // Disallowed because search and assistant is disabled by policy. + DISALLOWED_BY_POLICY, // Disallowed because user's locale is not compatible. DISALLOWED_BY_LOCALE, // Disallowed because the feature flag is off. @@ -46,7 +42,9 @@ enum AssistantAllowedState { // Disallowed because the device is in public session. DISALLOWED_BY_PUBLIC_SESSION, // Disallowed because the user's account type is currently not supported. - DISALLOWED_BY_ACCOUNT_TYPE + DISALLOWED_BY_ACCOUNT_TYPE, + // Disallowed because the device is in Kiosk mode. + DISALLOWED_BY_KIOSK_MODE }; // Allows observing changes to voice interaction status and settings. @@ -64,12 +62,6 @@ interface VoiceInteractionObserver { // Called when hotword listening is enabled/disabled. OnVoiceInteractionHotwordEnabled(bool enabled); - // Called when hotword is set to always on/only with power source. - OnVoiceInteractionHotwordAlwaysOn(bool always_on); - - // Called when consent status is updated. - OnVoiceInteractionConsentStatusUpdated(ConsentStatus consent_status); - // Called when assistant feature allowed state has changed. OnAssistantFeatureAllowedChanged(AssistantAllowedState state); @@ -88,62 +80,6 @@ interface VoiceInteractionObserver { // Interface for ash client (Chrome) to connect to the voice interaction // controller, which notifies changes of voice interaction related flags. interface VoiceInteractionController { - // Called when the voice interaction state is changed. - NotifyStatusChanged(VoiceInteractionState state); - - // Called when the voice interaction settings is enabled/disabled. - NotifySettingsEnabled(bool enabled); - - // Called when the voice interaction context is enabled/disabled. - // If context is enabled the screenshot will be passed in voice - // interaction session. - NotifyContextEnabled(bool enabled); - - // Called when the hotword listening is enabled/disabled. - NotifyHotwordEnabled(bool enabled); - - // Called when the hotword is set to always on/only with power source. - NotifyHotwordAlwaysOn(bool enabled); - - // Called when the consent status is obtained from the server. - NotifyConsentStatus(ConsentStatus consent_status); - - // Notify if voice interaction feature is allowed or not. e.g. not allowed - // if disabled by policy. - NotifyFeatureAllowed(AssistantAllowedState state); - - // Called when the notification is enabled/disabled. - NotifyNotificationEnabled(bool enabled); - - // Called when the locale is changed. - NotifyLocaleChanged(string locale); - - // Called when the launch with mic open state is changed. - NotifyLaunchWithMicOpen(bool launch_with_mic_open); - - // Called when Google Play Store is enabled/disabled. - NotifyArcPlayStoreEnabledChanged(bool enabled); - - // Called when locked full screen state is enabled/disabled. - NotifyLockedFullScreenStateChanged(bool enabled); - // Add an observer. AddObserver(VoiceInteractionObserver observer); }; - -// The status of the user's consent. The enum values cannot be changed because -// they are persisted on disk. -enum ConsentStatus { - // The status is unknown. - kUnknown = 0, - - // The user accepted activity control access. - kActivityControlAccepted = 1, - - // The user is not authorized to give consent. - kUnauthorized = 2, - - // The user's consent information is not found. This is typically the case - // when consent from the user has never been requested. - kNotFound = 3, -}; diff --git a/chromium/ash/public/interfaces/window_pin_type.mojom b/chromium/ash/public/interfaces/window_pin_type.mojom deleted file mode 100644 index d5b10bee7c5..00000000000 --- a/chromium/ash/public/interfaces/window_pin_type.mojom +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2017 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; - -// The window's pin type enum. -enum WindowPinType { - NONE, - - // The window is pinned on top of other windows. - PINNED, - - // The window is pinned on top of other windows. It is similar to - // PINNED but does not allow user to exit the mode by shortcut key. - TRUSTED_PINNED, -}; - -// The window's pin type. Maps to ash::kWindowPinTypeKey. -const string kWindowPinType_Property = "ash:window-pin-type"; diff --git a/chromium/ash/public/interfaces/window_properties.mojom b/chromium/ash/public/interfaces/window_properties.mojom deleted file mode 100644 index fa05ba64241..00000000000 --- a/chromium/ash/public/interfaces/window_properties.mojom +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2017 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; - -// App type of the window, like browser or app. The type is an int but should -// be one of ash::AppType (see ash/public/cpp/app_types.h). -const string kAppType_Property = "ash:app-type"; - -// A bool to indicate whether this window should be replaced by a black -// rectangle in assistant screenshot for privacy purpose. -const string kBlockedForAssistantSnapshot_Property = - "ash:blocked-for-assistant-snapshot"; - -// A bool to indicate whether the window can attach into another window. Used -// by tab-dragging. -const string kCanAttachToAnotherWindow_Property = - "ash:can-attach-to-another-window"; - -// V1 apps can intercept system keys. This will let the app handle F-keys instead -// of the window manager. -const string kCanConsumeSystemKeys_Property = - "ash:can-consume-system-keys"; - -// True if the window should be hidden in ash overview mode. Type: bool. -const string kHideInOverview_Property = "ash:hide_in_overview"; - -// True if the shelf should be hidden when this window is put into fullscreen. -// Exposed because some windows want to explicitly opt-out of this. -const string kHideShelfWhenFullscreen_Property = - "ash:hide-shelf-when-fullscreen"; - -// See ash::kImmersiveImpliedByFullscreen. -const string kImmersiveImpliedByFullscreen_Property = - "ash:immersive-implied-by-fullscreen"; - -// See ash::kImmersiveIsActive. -const string kImmersiveIsActive_Property = "ash:immersive-is-active"; - -// See ash::kImmersiveTopContainerBoundsInScreen. -const string kImmersiveTopContainerBoundsInScreen_Property = - "ash:immersive-top-container-bounds-in-screen"; - -// If true, the window is the target window for the tab-dragged window. The -// key is used by overview to show a highlight indication to indicate which -// overview window the dragged tabs will merge into when the user releases the -// pointer. -const string kIsDeferredTabDraggingTargetWindow_Property = - "ash:is-deferred-tab-dragging-target-window"; - -// If true, the window is a browser window and its tab(s) are currently being -// dragged. -const string kIsDraggingTabs_Property = "ash:is-dragging-tabs"; - -// If true, the window is currently showing in overview mode. -const string kIsShowingInOverview_Property = "ash:is-showing-in-overview"; - -// A property key to store the address of the source window that the drag -// originated from if the window is currently in tab-dragging process. -const string kTabDraggingSourceWindow_Property = - "ash:tab-dragging-source-window"; - -// This is put on windows to indicate that ash should perform auto management of -// window positions; when you open a second browser, ash will move the two to -// minimize overlap. -const string kWindowPositionManaged_Property = - "ash:window-position-managed"; - -// A property key which stores the bounds to restore a window to. These take -// preference over the current bounds. This is used by e.g. the tablet mode -// window manager. -const string kRestoreBoundsOverride_Property = - "ash:restore-bounds-override"; - -// A property key which stores the window state to restore a window to. These -// take preference over the current state if -// |kRestoreWindowStateTypeOverrideKey| is set. This is used by e.g. the tablet -// mode window manager. -const string kRestoreWindowStateTypeOverride_Property = - "ash:restore-window-state-type-override"; - -// The height of the window header, i.e. the inset between the frame and client -// view. -const string kTopViewInset_Property = "ash:top-view-inset"; - -// A boolean property to indicate a picture-in-picture window. -const string kIsWindowPip_Property = "ash:is-window-pip"; diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 8f116a99245..cb5621cdea3 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -10,8 +10,11 @@ aggregate_vector_icons("ash_vector_icons") { icons = [ "always_show_shelf.icon", + "assistant.icon", + "assistant_mic.icon", "auto_hide.icon", "autoclick.icon", + "autoclick_close.icon", "autoclick_double_click.icon", "autoclick_drag.icon", "autoclick_left_click.icon", @@ -21,6 +24,11 @@ aggregate_vector_icons("ash_vector_icons") { "autoclick_position_bottom_right.icon", "autoclick_position_top_left.icon", "autoclick_position_top_right.icon", + "autoclick_scroll.icon", + "autoclick_scroll_down.icon", + "autoclick_scroll_left.icon", + "autoclick_scroll_right.icon", + "autoclick_scroll_up.icon", "captive_portal.icon", "check_circle.icon", "desks_close_desk_button.icon", @@ -89,6 +97,7 @@ aggregate_vector_icons("ash_vector_icons") { "notification_keyboard.icon", "notification_low_power_charger.icon", "notification_monitor_warning.icon", + "notification_multi_device_setup.icon", "notification_screen.icon", "notification_screenshare.icon", "notification_sms_sync.icon", @@ -96,6 +105,8 @@ aggregate_vector_icons("ash_vector_icons") { "notification_timer.icon", "overview_window_close.icon", "overview_drop_target_plus.icon", + "overflow_shelf_left.icon", + "overflow_shelf_right.icon", "palette_action_capture_region.icon", "palette_action_capture_screen.icon", "palette_action_create_note.icon", @@ -109,6 +120,12 @@ aggregate_vector_icons("ash_vector_icons") { "palette_tray_icon_magnify.icon", "palette_tray_icon_metalayer.icon", "parent_access_lock.icon", + "lock_screen_pause.icon", + "lock_screen_play.icon", + "lock_screen_previous_track.icon", + "lock_screen_next_track.icon", + "lock_screen_seek_forward.icon", + "lock_screen_seek_backward.icon", "send.icon", "settings.icon", "shelf_add_person_button.icon", @@ -178,8 +195,6 @@ aggregate_vector_icons("ash_vector_icons") { "system_menu_tracing.icon", "system_menu_timer.icon", "system_menu_new_user.icon", - "system_menu_night_light_off.icon", - "system_menu_night_light_on.icon", "system_menu_usb.icon", "system_menu_videocam.icon", "system_menu_volume_high.icon", @@ -196,7 +211,6 @@ aggregate_vector_icons("ash_vector_icons") { "system_tray_do_not_disturb.icon", "system_tray_family_link.icon", "system_tray_managed.icon", - "system_tray_night_light.icon", "system_tray_notification_counter_plus.icon", "system_tray_recording.icon", "system_tray_rotation_lock_auto.icon", |