diff options
Diffstat (limited to 'chromium/ash')
28 files changed, 484 insertions, 409 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index d130455d8a8..7a5bfe0cf6a 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -48,6 +48,11 @@ component("ash") { "frame/wide_frame_view.h", "login/ui/lock_window.h", "magnifier/magnification_controller.h", + + # TODO: move MultiUserWindowManager (and delegate) to sources: + # https://crbug.com/756085 + "multi_user/multi_user_window_manager.h", + "multi_user/multi_user_window_manager_delegate_classic.h", "new_window_controller.h", "root_window_controller.h", "screenshot_delegate.h", @@ -62,7 +67,6 @@ component("ash") { "system/status_area_widget.h", "system/status_area_widget_delegate.h", "system/system_tray_focus_observer.h", - "system/tray/system_tray.h", "system/tray/system_tray_notifier.h", "system/unified/unified_system_tray.h", "touch/touch_observer_hud.h", @@ -85,6 +89,7 @@ component("ash") { "wm/window_util.h", "wm/wm_event.h", "wm/workspace/workspace_window_resizer.h", + "ws/window_lookup.h", ] sources = [ "accelerators/accelerator_commands.cc", @@ -163,8 +168,6 @@ component("ash") { "assistant/assistant_interaction_controller.h", "assistant/assistant_notification_controller.cc", "assistant/assistant_notification_controller.h", - "assistant/assistant_response_processor.cc", - "assistant/assistant_response_processor.h", "assistant/assistant_screen_context_controller.cc", "assistant/assistant_screen_context_controller.h", "assistant/assistant_setup_controller.cc", @@ -179,9 +182,10 @@ component("ash") { "assistant/model/assistant_interaction_model_observer.h", "assistant/model/assistant_query.cc", "assistant/model/assistant_query.h", + "assistant/model/assistant_query_history.cc", + "assistant/model/assistant_query_history.h", "assistant/model/assistant_response.cc", "assistant/model/assistant_response.h", - "assistant/model/assistant_response_observer.h", "assistant/model/assistant_screen_context_model.cc", "assistant/model/assistant_screen_context_model.h", "assistant/model/assistant_screen_context_model_observer.h", @@ -218,6 +222,8 @@ component("ash") { "assistant/ui/dialog_plate/dialog_plate.h", "assistant/ui/logo_view/base_logo_view.cc", "assistant/ui/logo_view/base_logo_view.h", + "assistant/ui/main_stage/assistant_card_element_view.cc", + "assistant/ui/main_stage/assistant_card_element_view.h", "assistant/ui/main_stage/assistant_footer_view.cc", "assistant/ui/main_stage/assistant_footer_view.h", "assistant/ui/main_stage/assistant_header_view.cc", @@ -248,12 +254,18 @@ component("ash") { "assistant/util/views_util.h", "autoclick/autoclick_controller.cc", "autoclick/autoclick_controller.h", + "autoclick/autoclick_drag_event_rewriter.cc", + "autoclick/autoclick_drag_event_rewriter.h", + "autoclick/autoclick_ring_handler.cc", + "autoclick/autoclick_ring_handler.h", "bluetooth_devices_observer.cc", "bluetooth_devices_observer.h", "cancel_mode.cc", "cancel_mode.h", "cast_config_controller.cc", "cast_config_controller.h", + "contained_shell/contained_shell_controller.cc", + "contained_shell/contained_shell_controller.h", "dbus/ash_dbus_services.cc", "dbus/ash_dbus_services.h", "dbus/display_service_provider.cc", @@ -393,7 +405,6 @@ component("ash") { "keyboard/virtual_keyboard_container_layout_manager.h", "keyboard/virtual_keyboard_controller.cc", "keyboard/virtual_keyboard_controller.h", - "keyboard/virtual_keyboard_controller_observer.h", "laser/laser_pointer_controller.cc", "laser/laser_pointer_controller.h", "laser/laser_pointer_view.cc", @@ -484,6 +495,12 @@ component("ash") { "magnifier/magnifier_scale_utils.h", "magnifier/partial_magnification_controller.cc", "magnifier/partial_magnification_controller.h", + "media/media_notification_constants.cc", + "media/media_notification_constants.h", + "media/media_notification_controller.cc", + "media/media_notification_controller.h", + "media/media_notification_view.cc", + "media/media_notification_view.h", "media_controller.cc", "media_controller.h", "metrics/demo_session_metrics_recorder.cc", @@ -510,13 +527,14 @@ component("ash") { "multi_device_setup/multi_device_notification_presenter.h", "multi_profile_uma.cc", "multi_profile_uma.h", + "multi_user/multi_user_window_manager.cc", + "multi_user/user_switch_animator.cc", + "multi_user/user_switch_animator.h", "network_connect_delegate_mus.cc", "network_connect_delegate_mus.h", "new_window_controller.cc", "note_taking_controller.cc", "note_taking_controller.h", - "pointer_watcher_adapter.cc", - "pointer_watcher_adapter.h", "policy/policy_recommendation_restorer.cc", "policy/policy_recommendation_restorer.h", "root_window_controller.cc", @@ -578,6 +596,8 @@ component("ash") { "shelf/shelf_constants.h", "shelf/shelf_context_menu_model.cc", "shelf/shelf_context_menu_model.h", + "shelf/shelf_control_button.cc", + "shelf/shelf_control_button.h", "shelf/shelf_controller.cc", "shelf/shelf_controller.h", "shelf/shelf_layout_manager.cc", @@ -621,35 +641,34 @@ component("ash") { "sticky_keys/sticky_keys_overlay.cc", "sticky_keys/sticky_keys_overlay.h", "sticky_keys/sticky_keys_state.h", + "system/accessibility/accessibility_feature_pod_controller.cc", + "system/accessibility/accessibility_feature_pod_controller.h", "system/accessibility/dictation_button_tray.cc", "system/accessibility/dictation_button_tray.h", "system/accessibility/select_to_speak_tray.cc", "system/accessibility/select_to_speak_tray.h", + "system/accessibility/tray_accessibility.cc", + "system/accessibility/tray_accessibility.h", + "system/accessibility/unified_accessibility_detailed_view_controller.cc", + "system/accessibility/unified_accessibility_detailed_view_controller.h", "system/audio/audio_detailed_view.cc", "system/audio/audio_detailed_view.h", "system/audio/display_speaker_controller.cc", "system/audio/display_speaker_controller.h", - "system/audio/tray_audio.cc", - "system/audio/tray_audio.h", "system/audio/unified_audio_detailed_view_controller.cc", "system/audio/unified_audio_detailed_view_controller.h", "system/audio/unified_volume_slider_controller.cc", "system/audio/unified_volume_slider_controller.h", "system/audio/unified_volume_view.cc", "system/audio/unified_volume_view.h", - "system/audio/volume_view.cc", - "system/audio/volume_view.h", "system/bluetooth/bluetooth_detailed_view.cc", "system/bluetooth/bluetooth_detailed_view.h", "system/bluetooth/bluetooth_feature_pod_controller.cc", "system/bluetooth/bluetooth_feature_pod_controller.h", "system/bluetooth/bluetooth_notification_controller.cc", "system/bluetooth/bluetooth_notification_controller.h", - "system/bluetooth/bluetooth_observer.h", "system/bluetooth/bluetooth_power_controller.cc", "system/bluetooth/bluetooth_power_controller.h", - "system/bluetooth/tray_bluetooth.cc", - "system/bluetooth/tray_bluetooth.h", "system/bluetooth/tray_bluetooth_helper.cc", "system/bluetooth/tray_bluetooth_helper.h", "system/bluetooth/tray_bluetooth_helper_experimental.cc", @@ -660,8 +679,6 @@ component("ash") { "system/bluetooth/unified_bluetooth_detailed_view_controller.h", "system/brightness/brightness_controller_chromeos.cc", "system/brightness/brightness_controller_chromeos.h", - "system/brightness/tray_brightness.cc", - "system/brightness/tray_brightness.h", "system/brightness/unified_brightness_slider_controller.cc", "system/brightness/unified_brightness_slider_controller.h", "system/brightness/unified_brightness_view.cc", @@ -680,19 +697,9 @@ component("ash") { "system/date/clock_observer.h", "system/date/date_view.cc", "system/date/date_view.h", - "system/date/system_info_default_view.cc", - "system/date/system_info_default_view.h", "system/date/tray_system_info.cc", "system/date/tray_system_info.h", - "system/display_scale/scale_detailed_view.cc", - "system/display_scale/scale_detailed_view.h", - "system/display_scale/scale_view.cc", - "system/display_scale/scale_view.h", - "system/display_scale/tray_scale.cc", - "system/display_scale/tray_scale.h", "system/enterprise/enterprise_domain_observer.h", - "system/enterprise/tray_enterprise.cc", - "system/enterprise/tray_enterprise.h", "system/flag_warning/flag_warning_tray.cc", "system/flag_warning/flag_warning_tray.h", "system/ime/ime_feature_pod_controller.cc", @@ -708,15 +715,17 @@ component("ash") { "system/ime_menu/ime_menu_tray.h", "system/keyboard_brightness/keyboard_brightness_controller.cc", "system/keyboard_brightness/keyboard_brightness_controller.h", - "system/keyboard_brightness/tray_keyboard_brightness.cc", - "system/keyboard_brightness/tray_keyboard_brightness.h", "system/keyboard_brightness/unified_keyboard_brightness_slider_controller.cc", "system/keyboard_brightness/unified_keyboard_brightness_slider_controller.h", "system/keyboard_brightness_control_delegate.h", + "system/locale/locale_detailed_view.cc", + "system/locale/locale_detailed_view.h", + "system/locale/locale_feature_pod_controller.cc", + "system/locale/locale_feature_pod_controller.h", "system/locale/locale_notification_controller.cc", "system/locale/locale_notification_controller.h", - "system/media_security/multi_profile_media_tray_item.cc", - "system/media_security/multi_profile_media_tray_item.h", + "system/locale/unified_locale_detailed_view_controller.cc", + "system/locale/unified_locale_detailed_view_controller.h", "system/message_center/arc_notification_manager_delegate_impl.cc", "system/message_center/arc_notification_manager_delegate_impl.h", "system/message_center/ash_message_center_lock_screen_controller.cc", @@ -727,10 +736,6 @@ component("ash") { "system/message_center/fullscreen_notification_blocker.h", "system/message_center/inactive_user_notification_blocker.cc", "system/message_center/inactive_user_notification_blocker.h", - "system/message_center/message_center_bubble.cc", - "system/message_center/message_center_bubble.h", - "system/message_center/message_center_button_bar.cc", - "system/message_center/message_center_button_bar.h", "system/message_center/message_center_controller.cc", "system/message_center/message_center_controller.h", "system/message_center/message_center_scroll_bar.cc", @@ -739,22 +744,12 @@ component("ash") { "system/message_center/message_center_ui_controller.cc", "system/message_center/message_center_ui_controller.h", "system/message_center/message_center_ui_delegate.h", - "system/message_center/message_center_view.cc", - "system/message_center/message_center_view.h", - "system/message_center/message_list_view.cc", - "system/message_center/message_list_view.h", - "system/message_center/new_unified_message_center_view.cc", - "system/message_center/new_unified_message_center_view.h", "system/message_center/notification_swipe_control_view.cc", "system/message_center/notification_swipe_control_view.h", - "system/message_center/notification_tray.cc", - "system/message_center/notification_tray.h", "system/message_center/notifier_settings_view.cc", "system/message_center/notifier_settings_view.h", "system/message_center/session_state_notification_blocker.cc", "system/message_center/session_state_notification_blocker.h", - "system/message_center/slidable_message_view.cc", - "system/message_center/slidable_message_view.h", "system/message_center/unified_message_center_view.cc", "system/message_center/unified_message_center_view.h", "system/message_center/unified_message_list_view.cc", @@ -784,6 +779,8 @@ component("ash") { "system/network/network_icon_animation.cc", "system/network/network_icon_animation.h", "system/network/network_icon_animation_observer.h", + "system/network/network_icon_purger.cc", + "system/network/network_icon_purger.h", "system/network/network_info.cc", "system/network/network_info.h", "system/network/network_list.cc", @@ -793,12 +790,12 @@ component("ash") { "system/network/network_row_title_view.h", "system/network/network_state_list_detailed_view.cc", "system/network/network_state_list_detailed_view.h", + "system/network/network_tray_icon_strategy.cc", + "system/network/network_tray_icon_strategy.h", "system/network/network_tray_view.cc", "system/network/network_tray_view.h", "system/network/sms_observer.cc", "system/network/sms_observer.h", - "system/network/tray_network.cc", - "system/network/tray_network.h", "system/network/tray_network_state_observer.cc", "system/network/tray_network_state_observer.h", "system/network/tray_vpn.cc", @@ -823,8 +820,6 @@ component("ash") { "system/night_light/night_light_toggle_button.h", "system/night_light/time_of_day.cc", "system/night_light/time_of_day.h", - "system/night_light/tray_night_light.cc", - "system/night_light/tray_night_light.h", "system/overview/overview_button_tray.cc", "system/overview/overview_button_tray.h", "system/palette/common_palette_tool.cc", @@ -893,22 +888,14 @@ component("ash") { "system/power/video_activity_notifier.h", "system/rotation/rotation_lock_feature_pod_controller.cc", "system/rotation/rotation_lock_feature_pod_controller.h", - "system/rotation/tray_rotation_lock.cc", - "system/rotation/tray_rotation_lock.h", "system/screen_layout_observer.cc", "system/screen_layout_observer.h", "system/screen_security/screen_capture_observer.h", - "system/screen_security/screen_capture_tray_item.cc", - "system/screen_security/screen_capture_tray_item.h", "system/screen_security/screen_security_notification_controller.cc", "system/screen_security/screen_security_notification_controller.h", "system/screen_security/screen_share_observer.h", - "system/screen_security/screen_share_tray_item.cc", - "system/screen_security/screen_share_tray_item.h", "system/screen_security/screen_switch_check_controller.cc", "system/screen_security/screen_switch_check_controller.h", - "system/screen_security/screen_tray_item.cc", - "system/screen_security/screen_tray_item.h", "system/session/logout_button_tray.cc", "system/session/logout_button_tray.h", "system/session/logout_confirmation_controller.cc", @@ -917,8 +904,6 @@ component("ash") { "system/session/logout_confirmation_dialog.h", "system/session/session_limit_notification_controller.cc", "system/session/session_limit_notification_controller.h", - "system/session/tray_session_length_limit.cc", - "system/session/tray_session_length_limit.h", "system/status_area_layout_manager.cc", "system/status_area_layout_manager.h", "system/status_area_widget.cc", @@ -927,14 +912,8 @@ component("ash") { "system/supervised/supervised_icon_string.h", "system/supervised/supervised_notification_controller.cc", "system/supervised/supervised_notification_controller.h", - "system/supervised/tray_supervised_user.cc", - "system/supervised/tray_supervised_user.h", "system/system_notification_controller.cc", "system/system_notification_controller.h", - "system/tiles/tiles_default_view.cc", - "system/tiles/tiles_default_view.h", - "system/tiles/tray_tiles.cc", - "system/tiles/tray_tiles.h", "system/toast/toast_data.cc", "system/toast/toast_data.h", "system/toast/toast_manager.cc", @@ -956,17 +935,8 @@ component("ash") { "system/tray/size_range_layout.h", "system/tray/system_menu_button.cc", "system/tray/system_menu_button.h", - "system/tray/system_tray.cc", - "system/tray/system_tray_bubble.cc", - "system/tray/system_tray_bubble.h", - "system/tray/system_tray_item.cc", - "system/tray/system_tray_item.h", - "system/tray/system_tray_item_detailed_view_delegate.cc", - "system/tray/system_tray_item_detailed_view_delegate.h", "system/tray/system_tray_item_uma_type.h", "system/tray/system_tray_notifier.cc", - "system/tray/system_tray_view.cc", - "system/tray/system_tray_view.h", "system/tray/time_to_click_recorder.cc", "system/tray/time_to_click_recorder.h", "system/tray/tray_background_view.cc", @@ -984,12 +954,8 @@ component("ash") { "system/tray/tray_detailed_view.h", "system/tray/tray_event_filter.cc", "system/tray/tray_event_filter.h", - "system/tray/tray_image_item.cc", - "system/tray/tray_image_item.h", "system/tray/tray_info_label.cc", "system/tray/tray_info_label.h", - "system/tray/tray_item_more.cc", - "system/tray/tray_item_more.h", "system/tray/tray_item_view.cc", "system/tray/tray_item_view.h", "system/tray/tray_popup_ink_drop_style.h", @@ -1002,16 +968,6 @@ component("ash") { "system/tray/tri_view.cc", "system/tray/tri_view.h", "system/tray/view_click_listener.h", - "system/tray_accessibility.cc", - "system/tray_accessibility.h", - "system/tray_caps_lock.cc", - "system/tray_caps_lock.h", - "system/tray_drag_controller.cc", - "system/tray_drag_controller.h", - "system/tray_tracing.cc", - "system/tray_tracing.h", - "system/unified/accessibility_feature_pod_controller.cc", - "system/unified/accessibility_feature_pod_controller.h", "system/unified/collapse_button.cc", "system/unified/collapse_button.h", "system/unified/detailed_view_controller.h", @@ -1058,24 +1014,12 @@ component("ash") { "system/unified/unified_system_tray_view.h", "system/unified/user_chooser_view.cc", "system/unified/user_chooser_view.h", - "system/unified_accessibility_detailed_view_controller.cc", - "system/unified_accessibility_detailed_view_controller.h", - "system/update/tray_update.cc", - "system/update/tray_update.h", "system/update/update_notification_controller.cc", "system/update/update_notification_controller.h", - "system/user/button_from_view.cc", - "system/user/button_from_view.h", "system/user/login_status.cc", "system/user/login_status.h", "system/user/rounded_image_view.cc", "system/user/rounded_image_view.h", - "system/user/tray_user.cc", - "system/user/tray_user.h", - "system/user/user_card_view.cc", - "system/user/user_card_view.h", - "system/user/user_view.cc", - "system/user/user_view.h", "system/virtual_keyboard/virtual_keyboard_observer.h", "system/virtual_keyboard/virtual_keyboard_tray.cc", "system/virtual_keyboard/virtual_keyboard_tray.h", @@ -1147,12 +1091,8 @@ component("ash") { "wm/gestures/overview_gesture_handler.h", "wm/immersive_context_ash.cc", "wm/immersive_context_ash.h", - "wm/immersive_focus_watcher_classic.cc", - "wm/immersive_focus_watcher_classic.h", - "wm/immersive_gesture_handler_classic.cc", - "wm/immersive_gesture_handler_classic.h", - "wm/immersive_handler_factory_ash.cc", - "wm/immersive_handler_factory_ash.h", + "wm/immersive_gesture_drag_handler.cc", + "wm/immersive_gesture_drag_handler.h", "wm/lock_action_handler_layout_manager.cc", "wm/lock_action_handler_layout_manager.h", "wm/lock_layout_manager.cc", @@ -1198,6 +1138,10 @@ component("ash") { "wm/overview/window_selector_delegate.h", "wm/overview/window_selector_item.cc", "wm/overview/window_selector_item.h", + "wm/pip/pip_positioner.cc", + "wm/pip/pip_positioner.h", + "wm/pip/pip_window_resizer.cc", + "wm/pip/pip_window_resizer.h", "wm/property_util.cc", "wm/property_util.h", "wm/resize_shadow.cc", @@ -1325,6 +1269,9 @@ component("ash") { "ws/ash_gpu_interface_provider.h", "ws/ash_window_manager.cc", "ws/ash_window_manager.h", + "ws/multi_user_window_manager_bridge.cc", + "ws/multi_user_window_manager_bridge.h", + "ws/window_lookup.cc", "ws/window_service_delegate_impl.cc", "ws/window_service_delegate_impl.h", "ws/window_service_owner.cc", @@ -1342,8 +1289,10 @@ component("ash") { "//ash/wayland", "//components/discardable_memory/public/interfaces", "//mojo/public/cpp/system", + "//services/device/public/cpp/bluetooth", "//services/device/public/mojom", - "//services/service_manager/embedder", + "//services/media_session/public/mojom", + "//services/service_manager/public/cpp", "//services/ws:host", "//services/ws:lib", "//services/ws/common", @@ -1363,9 +1312,9 @@ component("ash") { "//ui/wm", ] deps = [ + "//ash/app_list/presenter", "//ash/app_menu", "//ash/assistant/ui:constants", - "//ash/autoclick/common:autoclick", "//ash/components/cursor", "//ash/components/fast_ink", "//ash/components/quick_launch/public/mojom", @@ -1420,8 +1369,7 @@ component("ash") { "//services/ws/public/mojom/input_devices", "//services/ws/remote_view_host", - # TODO(msw): Remove this; only ash_with_content should depend on webkit. - "//ash/app_list/presenter", + # TODO(msw): Remove this; ash should not depend on blink/webkit. "//third_party/blink/public:blink_headers", "//third_party/icu", "//third_party/qcms", @@ -1487,47 +1435,6 @@ component("ash") { } } -component("ash_with_content") { - sources = [ - "content/ash_with_content_export.h", - "content/keyboard_overlay/keyboard_overlay_delegate.cc", - "content/keyboard_overlay/keyboard_overlay_delegate.h", - "content/keyboard_overlay/keyboard_overlay_view.cc", - "content/keyboard_overlay/keyboard_overlay_view.h", - ] - - defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ] - - public_deps = [ - ":ash", - ] - deps = [ - "//ash/public/cpp", - "//base", - "//base/third_party/dynamic_annotations", - "//components/discardable_memory/public/interfaces", - "//content/public/browser", - "//gpu/config", - "//ipc", - "//mojo/public/cpp/bindings", - "//services/ws/public/mojom", - "//skia", - "//ui/aura", - "//ui/base", - "//ui/compositor", - "//ui/events", - "//ui/gfx", - "//ui/gfx/geometry", - "//ui/keyboard", - "//ui/resources", - "//ui/strings", - "//ui/views", - "//ui/views/controls/webview", - "//ui/web_dialogs", - "//url", - ] -} - static_library("ash_shell_lib") { testonly = true sources = [ @@ -1593,7 +1500,6 @@ static_library("ash_shell_lib_with_content") { deps = [ ":ash_shell_lib", - ":ash_with_content", ":test_support_without_content", "//ash/components/quick_launch:lib", "//ash/components/quick_launch/public/mojom", @@ -1646,8 +1552,6 @@ copy("dbus_service_files") { test("ash_content_unittests") { sources = [ "content/display/screen_orientation_controller_unittest.cc", - "content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc", - "content/keyboard_overlay/keyboard_overlay_view_unittest.cc", "test/ash_unittests.cc", ] configs += [ @@ -1657,7 +1561,6 @@ test("ash_content_unittests") { deps = [ ":ash", - ":ash_with_content", ":test_support_with_content", "//ash/public/cpp", "//base", @@ -1683,6 +1586,8 @@ test("ash_content_unittests") { "//ui/display", "//ui/display:test_support", "//ui/gl:test_support", + "//ui/keyboard", + "//ui/keyboard:mojom", "//ui/message_center", "//ui/message_center:test_support", "//ui/message_center/public/cpp", @@ -1729,9 +1634,13 @@ test("ash_unittests") { "ash_service_unittest.cc", "assistant/assistant_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", + "contained_shell/mock_contained_shell_client.cc", + "contained_shell/mock_contained_shell_client.h", "cursor_unittest.cc", "detachable_base/detachable_base_handler_unittest.cc", "detachable_base/detachable_base_notification_controller_unittest.cc", @@ -1812,6 +1721,8 @@ test("ash_unittests") { "magnifier/magnifier_test_utils.cc", "magnifier/magnifier_test_utils.h", "magnifier/partial_magnification_controller_unittest.cc", + "media/media_notification_controller_unittest.cc", + "media/media_notification_view_unittest.cc", "metrics/demo_session_metrics_recorder_unittest.cc", "metrics/desktop_task_switch_metric_recorder_unittest.cc", "metrics/login_metrics_recorder_unittest.cc", @@ -1821,7 +1732,6 @@ test("ash_unittests") { "metrics/user_metrics_recorder_unittest.cc", "multi_device_setup/multi_device_notification_presenter_unittest.cc", "mus_property_mirror_ash_unittest.cc", - "pointer_watcher_adapter_unittest.cc", "policy/policy_recommendation_restorer_unittest.cc", "root_window_controller_unittest.cc", "rotator/screen_rotation_animation_unittest.cc", @@ -1848,44 +1758,35 @@ test("ash_unittests") { "shell_unittest.cc", "sticky_keys/sticky_keys_overlay_unittest.cc", "sticky_keys/sticky_keys_unittest.cc", + "system/accessibility/accessibility_feature_pod_controller_unittest.cc", "system/accessibility/dictation_button_tray_unittest.cc", "system/accessibility/select_to_speak_tray_unittest.cc", - "system/audio/tray_audio_unittest.cc", + "system/accessibility/tray_accessibility_unittest.cc", "system/bluetooth/bluetooth_power_controller_unittest.cc", "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc", - "system/brightness/tray_brightness_unittest.cc", "system/caps_lock_notification_controller_unittest.cc", "system/date/date_view_unittest.cc", - "system/date/system_info_default_view_unittest.cc", - "system/enterprise/tray_enterprise_unittest.cc", "system/flag_warning/flag_warning_tray_unittest.cc", "system/ime/ime_feature_pod_controller_unittest.cc", - "system/ime/tray_ime_chromeos_unittest.cc", "system/ime_menu/ime_menu_tray_unittest.cc", - "system/keyboard_brightness/tray_keyboard_brightness_unittest.cc", - "system/media_security/multi_profile_media_tray_item_unittest.cc", + "system/locale/locale_feature_pod_controller_unittest.cc", "system/message_center/arc/arc_notification_content_view_unittest.cc", "system/message_center/arc/arc_notification_manager_unittest.cc", "system/message_center/arc/arc_notification_view_unittest.cc", "system/message_center/ash_popup_alignment_delegate_unittest.cc", "system/message_center/inactive_user_notification_blocker_unittest.cc", "system/message_center/message_center_ui_controller_unittest.cc", - "system/message_center/message_center_view_unittest.cc", - "system/message_center/message_list_view_unittest.cc", - "system/message_center/new_unified_message_center_view_unittest.cc", - "system/message_center/notification_tray_unittest.cc", "system/message_center/notifier_settings_view_unittest.cc", "system/message_center/session_state_notification_blocker_unittest.cc", + "system/message_center/unified_message_center_view_unittest.cc", "system/message_center/unified_message_list_view_unittest.cc", "system/network/auto_connect_notifier_unittest.cc", "system/network/network_icon_unittest.cc", "system/network/sms_observer_unittest.cc", - "system/network/tray_network_unittest.cc", "system/network/vpn_list_unittest.cc", "system/network/wifi_toggle_notification_controller_unittest.cc", "system/night_light/night_light_controller_unittest.cc", "system/night_light/time_of_day_unittest.cc", - "system/night_light/tray_night_light_unittest.cc", "system/overview/overview_button_tray_unittest.cc", "system/palette/mock_palette_tool_delegate.cc", "system/palette/mock_palette_tool_delegate.h", @@ -1906,39 +1807,27 @@ test("ash_unittests") { "system/power/power_status_view_unittest.cc", "system/power/video_activity_notifier_unittest.cc", "system/rotation/rotation_lock_feature_pod_controller_unittest.cc", - "system/rotation/tray_rotation_lock_unittest.cc", "system/screen_layout_observer_unittest.cc", "system/screen_security/screen_security_notification_controller_unittest.cc", - "system/screen_security/screen_tray_item_unittest.cc", "system/session/logout_button_tray_unittest.cc", "system/session/logout_confirmation_controller_unittest.cc", "system/session/session_limit_notification_controller_unittest.cc", - "system/session/tray_session_length_limit_unittest.cc", "system/status_area_widget_unittest.cc", "system/supervised/supervised_notification_controller_unittest.cc", - "system/supervised/tray_supervised_user_unittest.cc", - "system/tiles/tray_tiles_unittest.cc", "system/toast/toast_manager_unittest.cc", "system/tracing_notification_controller_unittest.cc", "system/tray/size_range_layout_unittest.cc", - "system/tray/system_tray_unittest.cc", - "system/tray/tray_detailed_view_unittest.cc", "system/tray/tray_event_filter_unittest.cc", "system/tray/tray_info_label_unittest.cc", "system/tray/tri_view_unittest.cc", - "system/tray_accessibility_unittest.cc", - "system/tray_caps_lock_unittest.cc", - "system/tray_tracing_unittest.cc", - "system/unified/accessibility_feature_pod_controller_unittest.cc", "system/unified/feature_pods_container_view_unittest.cc", "system/unified/quiet_mode_feature_pod_controller_unittest.cc", "system/unified/top_shortcuts_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", - "system/update/tray_update_unittest.cc", "system/update/update_notification_controller_unittest.cc", - "system/user/tray_user_unittest.cc", + "system/virtual_keyboard/virtual_keyboard_tray_unittest.cc", "test/ash_test_helper_unittest.cc", "test/ash_unittests.cc", "tooltips/tooltip_controller_unittest.cc", @@ -1963,6 +1852,7 @@ test("ash_unittests") { "wm/fullscreen_window_finder_unittest.cc", "wm/gestures/overview_gesture_handler_unittest.cc", "wm/immersive_fullscreen_controller_unittest.cc", + "wm/immersive_gesture_drag_handler_unittest.cc", "wm/lock_action_handler_layout_manager_unittest.cc", "wm/lock_layout_manager_unittest.cc", "wm/lock_state_controller_unittest.cc", @@ -1975,6 +1865,9 @@ test("ash_unittests") { "wm/overview/start_animation_observer_unittest.cc", "wm/overview/window_selector_controller_unittest.cc", "wm/overview/window_selector_unittest.cc", + "wm/pip/pip_positioner_unittest.cc", + "wm/pip/pip_unittest.cc", + "wm/pip/pip_window_resizer_unittest.cc", "wm/resize_shadow_and_cursor_unittest.cc", "wm/root_window_layout_manager_unittest.cc", "wm/screen_dimmer_unittest.cc", @@ -2021,7 +1914,6 @@ test("ash_unittests") { "//ash/app_list:test_support", "//ash/app_list/presenter", "//ash/app_menu", - "//ash/autoclick/common:autoclick", "//ash/components/fast_ink", "//ash/components/fast_ink:unit_tests", "//ash/components/quick_launch/public/mojom:constants", @@ -2029,6 +1921,7 @@ test("ash_unittests") { "//ash/components/tap_visualizer:unit_tests", "//ash/keyboard/arc", "//ash/public/cpp", + "//ash/public/cpp:test_support", "//ash/public/cpp:unit_tests", "//ash/public/cpp/vector_icons", "//ash/resources/vector_icons", @@ -2060,7 +1953,8 @@ test("ash_unittests") { "//mojo/core/embedder", "//net:net", "//services/catalog:lib", - "//services/service_manager/public/cpp:service_test_support", + "//services/media_session/public/cpp/test:test_support", + "//services/media_session/public/mojom", "//services/ws:test_support", "//services/ws/public/cpp/input_devices:test_support", "//services/ws/public/mojom", @@ -2122,7 +2016,7 @@ test("ash_unittests") { "display/test_data/", ] - # Usage of content should be in ash_with_content. + # Disallow depending directly on content. assert_no_deps = [ "//content/public/browser", "//content/public/common", @@ -2198,7 +2092,6 @@ static_library("test_support_with_content") { public_deps = [ ":test_support_common", - "//ash:ash_with_content", "//content/public/browser", "//content/test:test_support", "//services/network:test_support", @@ -2222,6 +2115,8 @@ static_library("test_support_common") { "app_list/test/app_list_test_helper.h", "app_list/test/test_app_list_client.cc", "app_list/test/test_app_list_client.h", + "app_menu/notification_menu_view_test_api.cc", + "app_menu/notification_menu_view_test_api.h", "display/display_configuration_controller_test_api.cc", "display/display_configuration_controller_test_api.h", "display/mirror_window_test_api.cc", @@ -2241,6 +2136,8 @@ static_library("test_support_common") { "lock_screen_action/lock_screen_action_background_view_test_api.h", "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/time_to_first_present_recorder_test_api.cc", @@ -2249,12 +2146,6 @@ static_library("test_support_common") { "metrics/user_metrics_recorder_test_api.h", "mojo_test_interface_factory.cc", "mojo_test_interface_factory.h", - - # TODO(jamescook): Consider adding a //ash/public/cpp:test_support target. - "app_menu/notification_menu_view_test_api.cc", - "app_menu/notification_menu_view_test_api.h", - "public/cpp/immersive/immersive_fullscreen_controller_test_api.cc", - "public/cpp/immersive/immersive_fullscreen_controller_test_api.h", "rotator/screen_rotation_animator_test_api.cc", "rotator/screen_rotation_animator_test_api.h", "session/test_session_controller_client.cc", @@ -2285,10 +2176,6 @@ static_library("test_support_common") { "system/status_area_widget_test_api.h", "system/status_area_widget_test_helper.cc", "system/status_area_widget_test_helper.h", - "system/tray/system_tray_test_api.cc", - "system/tray/system_tray_test_api.h", - "system/tray/test_system_tray_item.cc", - "system/tray/test_system_tray_item.h", "system/unified/unified_system_tray_test_api.cc", "system/unified/unified_system_tray_test_api.h", "test/ash_test_base.cc", @@ -2335,6 +2222,7 @@ static_library("test_support_common") { public_deps = [ "//ash", + "//services/service_manager/public/cpp/test:test_support", "//testing/gtest", "//third_party/blink/public:blink_headers", "//ui/display:display_manager_test_api", @@ -2346,6 +2234,7 @@ static_library("test_support_common") { "//ash/app_menu", "//ash/components/fast_ink", "//ash/public/cpp", + "//ash/public/cpp:test_support", "//ash/public/interfaces:test_interfaces", "//base", "//base:i18n", @@ -2380,6 +2269,7 @@ static_library("test_support_common") { "//ui/gl", "//ui/gl:test_support", "//ui/keyboard", + "//ui/keyboard:test_support", "//ui/message_center", "//ui/message_center/public/cpp", "//ui/views", @@ -2409,6 +2299,7 @@ static_library("interactive_ui_test_support") { deps = [ ":test_support_with_content", "//base", + "//mojo/core/embedder", "//skia", "//testing/gtest", "//ui/aura", diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn index 260da88824c..f19efa84aac 100644 --- a/chromium/ash/app_list/BUILD.gn +++ b/chromium/ash/app_list/BUILD.gn @@ -110,6 +110,7 @@ component("app_list") { "//components/keyed_service/core", "//components/sync", "//mojo/public/cpp/bindings", + "//services/content/public/cpp", "//services/ws/public/cpp", "//services/ws/public/mojom", "//services/ws/remote_view_host", @@ -137,11 +138,14 @@ component("app_list") { public_deps = [ "//ash/app_list/model:app_list_model", "//ash/app_list/model:search_model", - "//ash/public/cpp:cpp", + "//ash/public/cpp", + "//services/content/public/mojom", ] } static_library("test_support") { + testonly = true + sources = [ "test/app_list_test_model.cc", "test/app_list_test_model.h", @@ -156,6 +160,7 @@ static_library("test_support") { deps = [ ":app_list", "//base", + "//services/content/public/cpp/test:test_support", "//ui/base:base", "//ui/events", "//ui/gfx", @@ -215,6 +220,10 @@ test("app_list_unittests") { "//base", "//base/test:test_support", "//mojo/core/embedder", + "//mojo/public/cpp/bindings", + "//services/content/public/cpp", + "//services/content/public/cpp/test:test_support", + "//services/content/public/mojom", "//skia", "//testing/gtest", "//ui/accessibility", diff --git a/chromium/ash/app_list/resources/BUILD.gn b/chromium/ash/app_list/resources/BUILD.gn index d42b3e763ff..030e69a8a88 100644 --- a/chromium/ash/app_list/resources/BUILD.gn +++ b/chromium/ash/app_list/resources/BUILD.gn @@ -15,8 +15,6 @@ grit("resources_grd") { source = "app_list_resources.grd" outputs = [ "grit/app_list_resources.h", - "grit/app_list_resources_map.cc", - "grit/app_list_resources_map.h", "app_list_resources_100_percent.pak", "app_list_resources_200_percent.pak", "app_list_resources_300_percent.pak", diff --git a/chromium/ash/autoclick/common/BUILD.gn b/chromium/ash/autoclick/common/BUILD.gn deleted file mode 100644 index 5c46da1712e..00000000000 --- a/chromium/ash/autoclick/common/BUILD.gn +++ /dev/null @@ -1,29 +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. - -import("//build/config/ui.gni") - -source_set("autoclick") { - sources = [ - "autoclick_controller_common.cc", - "autoclick_controller_common.h", - "autoclick_controller_common_delegate.h", - "autoclick_ring_handler.cc", - "autoclick_ring_handler.h", - ] - - deps = [ - "//base", - "//cc/paint", - "//skia", - "//ui/aura", - "//ui/compositor", - "//ui/display", - "//ui/events", - "//ui/gfx", - "//ui/gfx/geometry", - "//ui/views", - "//ui/wm", - ] -} diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 98ed33303c6..68b6f6893a2 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -9,8 +9,6 @@ component("cpp") { sources = [ "accelerators.cc", "accelerators.h", - "app_list/answer_card_contents_registry.cc", - "app_list/answer_card_contents_registry.h", "app_list/app_list_config.cc", "app_list/app_list_config.h", "app_list/app_list_constants.cc", @@ -47,6 +45,11 @@ component("cpp") { "ash_typography.cc", "ash_typography.h", "ash_view_ids.h", + "assistant/assistant_state_base.cc", + "assistant/assistant_state_base.h", + "assistant/assistant_state_proxy.cc", + "assistant/assistant_state_proxy.h", + "assistant/default_voice_interaction_observer.h", "caption_buttons/caption_button_model.h", "caption_buttons/caption_button_types.h", "caption_buttons/frame_back_button.cc", @@ -69,13 +72,11 @@ component("cpp") { "frame_utils.h", "gesture_action_type.h", "immersive/immersive_context.h", + "immersive/immersive_focus_watcher.cc", "immersive/immersive_focus_watcher.h", "immersive/immersive_fullscreen_controller.cc", "immersive/immersive_fullscreen_controller.h", "immersive/immersive_fullscreen_controller_delegate.h", - "immersive/immersive_gesture_handler.h", - "immersive/immersive_handler_factory.cc", - "immersive/immersive_handler_factory.h", "immersive/immersive_revealed_lock.cc", "immersive/immersive_revealed_lock.h", "login_constants.h", @@ -85,10 +86,14 @@ component("cpp") { "mus_property_mirror_ash.h", "network_icon_image_source.cc", "network_icon_image_source.h", + "notification_utils.cc", + "notification_utils.h", "power_utils.cc", "power_utils.h", "remote_shelf_item_delegate.cc", "remote_shelf_item_delegate.h", + "rounded_corner_decorator.cc", + "rounded_corner_decorator.h", "scale_utility.cc", "scale_utility.h", "session_types.h", @@ -125,15 +130,19 @@ component("cpp") { "//ash/public/cpp/vector_icons", "//chromeos:power_manager_proto", "//components/prefs", + "//services/service_manager/public/cpp", "//services/ws/public/mojom", "//skia/public/interfaces", "//ui/aura", "//ui/chromeos/strings", + "//ui/compositor_extra", "//ui/display", "//ui/events/devices", + "//ui/message_center/public/cpp", "//ui/views", "//ui/views/mus", "//ui/wm", + "//ui/wm/public", ] public_deps = [ @@ -152,6 +161,7 @@ component("cpp") { # this after Deserialize(Serialize()) API works with handles. mojom("test_interfaces") { visibility = [ ":unit_tests" ] + disable_variants = true sources = [ "shelf_struct_traits_test_service.mojom", @@ -168,6 +178,7 @@ source_set("unit_tests") { "default_scale_factor_retriever_unittest.cc", "menu_utils_unittest.cc", "power_utils_unittest.cc", + "rounded_corner_decorator_unittest.cc", "shelf_model_unittest.cc", "shelf_struct_mojom_traits_unittest.cc", ] @@ -177,6 +188,26 @@ source_set("unit_tests") { ":test_interfaces", "//base", "//testing/gtest", + "//ui/aura:test_support", "//ui/gfx:test_support", ] } + +source_set("test_support") { + sources = [ + "immersive/immersive_fullscreen_controller_test_api.cc", + "immersive/immersive_fullscreen_controller_test_api.h", + "test/test_keyboard_controller_observer.cc", + "test/test_keyboard_controller_observer.h", + ] + + deps = [ + ":cpp", + "//base", + "//services/service_manager/public/cpp", + "//ui/aura", + "//ui/gfx", + "//ui/keyboard:mojom", + "//ui/views", + ] +} diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn index 3a2b26ca058..f59841977d7 100644 --- a/chromium/ash/public/interfaces/BUILD.gn +++ b/chromium/ash/public/interfaces/BUILD.gn @@ -10,6 +10,7 @@ import("//mojo/public/tools/bindings/mojom.gni") # enums and constants). mojom("interfaces_internal") { visibility = [ "//ash/public/cpp:*" ] + disable_variants = true sources = [ "accelerator_controller.mojom", @@ -25,6 +26,7 @@ mojom("interfaces_internal") { "assistant_volume_control.mojom", "cast_config.mojom", "constants.mojom", + "contained_shell.mojom", "cros_display_config.mojom", "display_output_protection.mojom", "docked_magnifier_controller.mojom", @@ -41,6 +43,7 @@ mojom("interfaces_internal") { "login_user_info.mojom", "media.mojom", "menu.mojom", + "multi_user_window_manager.mojom", "new_window.mojom", "night_light_controller.mojom", "note_taking_controller.mojom", @@ -59,7 +62,6 @@ mojom("interfaces_internal") { "volume.mojom", "vpn_list.mojom", "wallpaper.mojom", - "web_contents_manager.mojom", "window_pin_type.mojom", "window_properties.mojom", "window_state_type.mojom", @@ -72,6 +74,7 @@ mojom("interfaces_internal") { "//components/arc/common:notifications", "//components/sync/mojo:interfaces", "//mojo/public/mojom/base", + "//services/content/public/mojom", "//services/preferences/public/mojom", "//skia/public/interfaces", "//ui/accessibility:ax_enums_mojo", @@ -95,7 +98,9 @@ mojom("interfaces_internal") { mojom("test_interfaces") { testonly = true + disable_variants = true sources = [ + "login_screen_test_api.mojom", "shelf_test_api.mojom", "shell_test_api.mojom", "status_area_widget_test_api.mojom", @@ -103,6 +108,7 @@ mojom("test_interfaces") { "time_to_first_present_recorder_test_api.mojom", ] deps = [ + "//components/account_id/interfaces", "//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 index d34a5f8ab49..f95fca1bef8 100644 --- a/chromium/ash/public/interfaces/accessibility_controller.mojom +++ b/chromium/ash/public/interfaces/accessibility_controller.mojom @@ -76,6 +76,29 @@ enum SelectToSpeakState { kSelectToSpeakStateSpeaking, }; +// The type of mouse event the dwell control feature should perform when +// dwelling. These values are written to prefs and should not be changed. +[Extensible] +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. +}; + // Allows a client to implement Select-to-Speak. // TODO(katie): Consider combining DispatchMouseEvent and DispatchKeyEvent // into a single DispatchEvent function. diff --git a/chromium/ash/public/interfaces/app_list.mojom b/chromium/ash/public/interfaces/app_list.mojom index eafa8839d8f..c11efda8784 100644 --- a/chromium/ash/public/interfaces/app_list.mojom +++ b/chromium/ash/public/interfaces/app_list.mojom @@ -8,9 +8,11 @@ import "ash/public/interfaces/menu.mojom"; import "components/sync/mojo/syncer.mojom"; import "mojo/public/mojom/base/string16.mojom"; import "mojo/public/mojom/base/unguessable_token.mojom"; +import "services/content/public/mojom/navigable_contents_factory.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; import "ui/gfx/image/mojo/image.mojom"; import "ui/gfx/range/mojo/range.mojom"; +import "url/mojom/url.mojom"; // A structure holding the common information which is sent between ash and, // chrome representing an app list item. @@ -30,13 +32,14 @@ struct AppListItemMetadata { // A structure holding the common information which is sent from chrome to ash, // representing a search result. -// This structure should be kept as small as possible so that ash can get and -// render search results as early as possible. struct SearchResultMetadata { string id; // The id of the result. mojo_base.mojom.String16 title; // The title of the result, e.g. an app's // name, an autocomplete query, etc. mojo_base.mojom.String16 details; // A detail string of this result. + mojo_base.mojom.String16 accessible_name; + // An text to be announced by a screen + // reader app. array<SearchResultTag> title_tags; // How the title matches the query. See // the SearchResultTag section for // more details. @@ -58,17 +61,18 @@ struct SearchResultMetadata { double display_score; // A score to determine the result display order. bool is_omnibox_search; // Whether this result is searched from Omnibox. bool is_installing; // Whether this result is installing. - mojo_base.mojom.UnguessableToken? answer_card_contents_token; - // A token used to render answer card, which is - // empty before initialized. It's illegal to pass - // an empty UnguessableToken across processes. So - // we use a null value when it's empty here. - gfx.mojom.Size? answer_card_size; // Preferred size of answer card. It is - // unset for non-answer-card results. For - // answer card results, it is set when - // the answer card WebContents finishes - // loading and its renderer notifies it - // about a new contents size. + + url.mojom.Url? query_url; // A query URL associated with this result. The + // meaning and treatment of the URL + // (e.g. displaying inline web contents) is + // dependent on the result type. + + string? equivalent_result_id; // An optional id that identifies an equivalent + // result to this result. Answer card result + // has this set to remove the equivalent + // omnibox search-what-you-typed result when + // there is an answer card for the query. + gfx.mojom.ImageSkia? icon; // The icon of this result. gfx.mojom.ImageSkia? chip_icon; // The icon of this result in a smaller // dimension to be rendered in suggestion @@ -371,4 +375,9 @@ interface AppListClient { StartVoiceInteractionSession(); // Starts or stops voice interaction session based on current state. ToggleVoiceInteractionSession(); + + // Acquires a NavigableContentsFactory (indirectly) from the Content Service + // to allow the app list to display embedded web contents. Currently used only + // for answer card search results. + GetNavigableContentsFactory(content.mojom.NavigableContentsFactory& request); }; diff --git a/chromium/ash/public/interfaces/ash_message_center_controller.mojom b/chromium/ash/public/interfaces/ash_message_center_controller.mojom index e00069f8554..a17e5e9645a 100644 --- a/chromium/ash/public/interfaces/ash_message_center_controller.mojom +++ b/chromium/ash/public/interfaces/ash_message_center_controller.mojom @@ -95,4 +95,7 @@ interface AshMessageCenterClient { // 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/ash_window_manager.mojom b/chromium/ash/public/interfaces/ash_window_manager.mojom index cc619dd73f6..f43be191ddb 100644 --- a/chromium/ash/public/interfaces/ash_window_manager.mojom +++ b/chromium/ash/public/interfaces/ash_window_manager.mojom @@ -4,6 +4,7 @@ module ash.mojom; +import "ash/public/interfaces/menu.mojom"; import "ui/events/mojo/event_constants.mojom"; // The previewed snap state for a window, corresponding to the use of a @@ -14,6 +15,18 @@ enum SnapDirection { kRight, // The phantom window controller is previewing a snap to the left. }; +enum OrientationLockType { + kAny, + kNatural, + kCurrent, + kPortrait, + kLandscape, + kPortraitPrimary, + kPortraitSecondary, + kLandscapePrimary, + kLandscapeSecondary, +}; + // Interface exposed via WindowTree::BindWindowManagerInterface(). This // interface is used for functionality specific to Ash that is associated with // windows created by the window service. @@ -24,7 +37,22 @@ interface AshWindowManager { CommitSnap(uint64 window_id, SnapDirection snap); + // Locks or unlocks the screen orientation. The provided window is the source + // of the orientation request and need not be a top level window, but the + // client connection type must not be an embedding (i.e. renderer). + LockOrientation(uint64 window_id, OrientationLockType type); + UnlockOrientation(uint64 window_id); + // Maximizes the window in response to a double click or tap on the HTCAPTION // area. MaximizeWindowByCaptionClick(uint64 window_id, ui.mojom.PointerKind pointer); + + // Plays the window bounce animation (scale the window up and down). + BounceWindow(uint64 window_id); + + // Sets the context menu items to be displayed on a window's frame, for + // windows where the frame is provided by Ash. |delegate| handles interaction + // with the menu. + SetWindowFrameMenuItems(uint64 window_id, array<MenuItem> menu_items, + MenuDelegate delegate); }; diff --git a/chromium/ash/public/interfaces/assistant_controller.mojom b/chromium/ash/public/interfaces/assistant_controller.mojom index 428ba398570..6eb95bcea75 100644 --- a/chromium/ash/public/interfaces/assistant_controller.mojom +++ b/chromium/ash/public/interfaces/assistant_controller.mojom @@ -5,7 +5,6 @@ module ash.mojom; import "ash/public/interfaces/assistant_image_downloader.mojom"; -import "ash/public/interfaces/web_contents_manager.mojom"; import "ash/public/interfaces/assistant_setup.mojom"; import "chromeos/services/assistant/public/mojom/assistant.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; @@ -23,18 +22,26 @@ interface AssistantController { SetAssistantImageDownloader( AssistantImageDownloader assistant_image_downloader); - // Provides an interface to the |web_contents_manager| owned by - // AssistantClient. - SetWebContentsManager(WebContentsManager web_contents_manager); - - // Provides an interface to the |assistant_setup| owned by AssistantClient. - SetAssistantSetup(AssistantSetup assistant_setup); - - // Requests screenshot of specified |rect| region and returns the screenshot - // encoded in JPEG format. If |rect| is empty, it returns fullscreen - // screenshot. - RequestScreenshot(gfx.mojom.Rect rect) => (array<uint8> screenshot); - // Opens Google Assistant settings. OpenAssistantSettings(); }; + +// Interface to the AssistantScreenContextController which is owned by the +// AssistantController. Currently used by the Assistant service to request +// screenshots. +interface AssistantScreenContextController { + // Requests a screenshot of the region enclosed by |rect| and returns the + // screenshot encoded in JPEG format. If |rect| is empty, it returns a + // fullscreen screenshot. + RequestScreenshot(gfx.mojom.Rect rect) => (array<uint8> screenshot); +}; + +// Interface to the AssistantSetupController which is owned by the +// AssistantController. Currently used by AssistantSetup in chrome/browser +// to provide an interface to itself. This is used for triggering a runtime +// onboarding flow. +interface AssistantSetupController { + // Provides an interface to the |assistant_setup| owned by AssistantClient + // in chrome/browser. + SetAssistantSetup(AssistantSetup assistant_setup); +};
\ No newline at end of file diff --git a/chromium/ash/public/interfaces/contained_shell.mojom b/chromium/ash/public/interfaces/contained_shell.mojom new file mode 100644 index 00000000000..516ab2d7920 --- /dev/null +++ b/chromium/ash/public/interfaces/contained_shell.mojom @@ -0,0 +1,18 @@ +// 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; + +// Performs browser-side functionality for the ContainedShell feature, +// e.g. launching a WebView to host the ContainedShell. +interface ContainedShellClient { +}; + +// Allows Ash and its consumers to interact with the ContainedShell +// feature, e.g. by requesting to launch the ContainedShell WebView. +// These requests are forwarded to the ContainedShellClient. +interface ContainedShellController { + // Provides a client for dispatching requests. + SetClient(ContainedShellClient client); +}; diff --git a/chromium/ash/public/interfaces/first_run_helper.mojom b/chromium/ash/public/interfaces/first_run_helper.mojom index 001b39b8d27..5d7791b071a 100644 --- a/chromium/ash/public/interfaces/first_run_helper.mojom +++ b/chromium/ash/public/interfaces/first_run_helper.mojom @@ -30,10 +30,6 @@ interface FirstRunHelper { // Closes the system tray bubble menu. Does nothing if the bubble is already // closed. CloseTrayBubble(); - - // Returns the bounds of the help button on the system tray bubble menu in - // screen coordinates. Returns empty bounds if the bubble is not open. - GetHelpButtonBounds() => (gfx.mojom.Rect screen_bounds); }; // The client for the FirstRunHelper interface, e.g. chrome. diff --git a/chromium/ash/public/interfaces/keyboard_controller.mojom b/chromium/ash/public/interfaces/keyboard_controller.mojom index e787a5b1d9d..3b7a10a0cbc 100644 --- a/chromium/ash/public/interfaces/keyboard_controller.mojom +++ b/chromium/ash/public/interfaces/keyboard_controller.mojom @@ -6,21 +6,41 @@ module ash.mojom; import "ui/gfx/geometry/mojo/geometry.mojom"; import "ui/keyboard/public/keyboard_config.mojom"; +import "ui/keyboard/public/keyboard_controller_types.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 the virtual keyboard window is destroyed, e.g. a change from - // tablet mode to laptop mode. This is not called when the keyboard is hidden. - OnKeyboardWindowDestroyed(); + // 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 virtual keyboard configuration changes. - OnKeyboardConfigChanged(keyboard.mojom.KeyboardConfig config); + // Called when the keyboard bounds change. |screen_bounds| is in screen + // coordinates. + OnKeyboardVisibleBoundsChanged(gfx.mojom.Rect screen_bounds); - // Called when the keyboard bounds change. - OnKeyboardVisibleBoundsChanged(gfx.mojom.Rect new_bounds); + // Called when the keyboard occluded bounds change. |screen_bounds| is in + // screen coordinates. + OnKeyboardOccludedBoundsChanged(gfx.mojom.Rect screen_bounds); }; interface KeyboardController { @@ -30,6 +50,57 @@ interface KeyboardController { // 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 privided 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/login_screen.mojom b/chromium/ash/public/interfaces/login_screen.mojom index 8337afdfe10..2cdc6814629 100644 --- a/chromium/ash/public/interfaces/login_screen.mojom +++ b/chromium/ash/public/interfaces/login_screen.mojom @@ -19,31 +19,36 @@ import "mojo/public/mojom/base/time.mojom"; enum OobeDialogState { // Showing other screen, which does not impact the visibility of login shelf // buttons. - NONE, + NONE = 0, // Showing gaia signin screen. - GAIA_SIGNIN, + GAIA_SIGNIN = 1, + + // AccountPicker = 2, not currently used // Showing wrong hardware identification screen. - WRONG_HWID_WARNING, + WRONG_HWID_WARNING = 3, // Showing supervised user creation screen. - SUPERVISED_USER_CREATION_FLOW, + SUPERVISED_USER_CREATION_FLOW = 4, // Showing SAML password confirmation screen. - SAML_PASSWORD_CONFIRM, + SAML_PASSWORD_CONFIRM = 5, // Showing password changed screen. - PASSWORD_CHANGED, + PASSWORD_CHANGED = 6, // Showing device enrollment screen. - ENROLLMENT, + ENROLLMENT = 7, // Showing error screen. - ERROR, + ERROR = 8, + + // Showing sync consent screen. + SYNC_CONSENT = 9, // Oobe UI dialog is currently hidden. - HIDDEN, + HIDDEN = 10, }; // Allows clients (e.g. the browser process) to send messages to the ash @@ -114,6 +119,17 @@ interface LoginScreen { // |is_enabled|: True if pin unlock is enabled. SetPinEnabledForUser(signin.mojom.AccountId account_id, bool is_enabled); + // Update the status of fingerprint for |account_id|. + SetFingerprintState(signin.mojom.AccountId account_id, + FingerprintState state); + + // Called after a fingerprint authentication attempt has been made. If + // |successful| is true, then the fingerprint authentication attempt was + // successful and the device should be unlocked. If false, an error message + // should be shown to the user. + NotifyFingerprintAuthResult(signin.mojom.AccountId account_id, + bool successful); + // Change the user's avatar. Some avatars may take a long time to load and the // login screen may already be visible. SetAvatarForUser(signin.mojom.AccountId account_id, UserAvatar avatar); @@ -173,9 +189,10 @@ interface LoginScreen { string locale, array<InputMethodItem> keyboard_layouts); - // Set the fingerprint unlock state for user with |account_id|. - SetFingerprintUnlockState(signin.mojom.AccountId account_id, - FingerprintUnlockState state); + // Sets whether full management disclosure is needed for the public/managed + // session login screen. + SetPublicSessionShowFullManagementDisclosure( + bool show_full_management_disclosure); // Update the kiosk app data for the login screen. SetKioskApps(array<KioskAppInfo> kiosk_apps); @@ -229,6 +246,9 @@ interface LoginScreenClient { AuthenticateUserWithExternalBinary(signin.mojom.AccountId account_id) => (bool auth_success); + // Attempt to enroll a user in the external binary authentication system. + EnrollUserWithExternalBinary() => (bool enrollment_success); + // Try to authenticate |account_id| using easy unlock. This can be used on the // login or lock screen. // |account_id|: The account id of the user we are authenticating. @@ -241,10 +261,6 @@ interface LoginScreenClient { // |account_id|: The account id of the user in the user pod. HardlockPod(signin.mojom.AccountId account_id); - // Record clicks on the lock icon in the user pod. - // |account_id|: The account id of the user in the user pod. - RecordClickOnLockIcon(signin.mojom.AccountId account_id); - // Focus user pod of user with |account_id|. OnFocusPod(signin.mojom.AccountId account_id); diff --git a/chromium/ash/public/interfaces/login_screen_test_api.mojom b/chromium/ash/public/interfaces/login_screen_test_api.mojom new file mode 100644 index 00000000000..8aca8d8c8b3 --- /dev/null +++ b/chromium/ash/public/interfaces/login_screen_test_api.mojom @@ -0,0 +1,16 @@ +// 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"; + +// Provides a high-level test API for controlling the login/lock screen. +interface LoginScreenTestApi { + // Returns true if the lock screen is currently being shown. + IsLockShown() => (bool is_shown); + + // Submit |password| for |account_id|. + SubmitPassword(signin.mojom.AccountId account_id, string password) => (); +}; diff --git a/chromium/ash/public/interfaces/login_user_info.mojom b/chromium/ash/public/interfaces/login_user_info.mojom index 7fcf4da275c..a58732b79f0 100644 --- a/chromium/ash/public/interfaces/login_user_info.mojom +++ b/chromium/ash/public/interfaces/login_user_info.mojom @@ -38,26 +38,19 @@ enum EasyUnlockIconId { SPINNER, }; -// Fingerprint unlock state in the views lock screen. -enum FingerprintUnlockState { - // Fingerprint unlock is not available. +// The status of fingerprint availability. +enum FingerprintState { + // The user cannot use fingerprint. This may be because: + // - they are not the primary user + // - they never registered fingerprint + // - the device does not have a fingerprint sensor UNAVAILABLE, - // Fingerprint unlock is available. + // Fingerprint can be used to unlock the device. AVAILABLE, - // The unlock attempt is successful, the fingerprint is matched. - AUTH_SUCCESS, - // The unlock attempt is unsuccessful; the fingerprint is not - // recognized; however, the user can make another fingerprint auth - // attempt. - AUTH_FAILED, - // The unlock attempt is unsuccessful; the fingerprint is not - // recognized. There have been too many unlock attempts and fingerprint - // is now disabled. - AUTH_DISABLED, - // Fingerprint unlock is disabled because user is forced to use an - // authentication method that authenticates via cryptohome. - // I.e., password, cryptohome-based PIN, easy unlock. - AUTH_DISABLED_FROM_TIMEOUT, + // There have been too many attempts, so now fingerprint is disabled. + DISABLED_FROM_ATTEMPTS, + // It has been too long since the device was last used. + DISABLED_FROM_TIMEOUT, }; // Information about the custom icon in the user pod. @@ -82,11 +75,6 @@ struct EasyUnlockIconOptions { // display via a separate EasyUnlockIconsOption update. See // login_screen.mojom::HardlockPod. bool hardlock_on_click; - // If true, the lock screen is being demoed so the user can test out easy - // unlock. The flow operates as normal. Hardlocking is disabled in this - // scenario. - // TODO(jdufault): This should be removed, as it does not change UI. - bool is_trial_run; }; // Infomation of each input method. This is used to populate keyboard layouts @@ -154,8 +142,9 @@ struct LoginUserInfo { // True if this user is the device owner. bool is_device_owner; - // True if fingerprint unlock is allowed for this user. - bool allow_fingerprint_unlock; + // The initial fingerprint state. There are other mojom methods (ie, + // login_screen.mojom::SetFingerprintState) which update the current state. + FingerprintState fingerprint_state; // True if multi-profiles sign in is allowed for this user. bool is_multiprofile_allowed; diff --git a/chromium/ash/public/interfaces/menu.mojom b/chromium/ash/public/interfaces/menu.mojom index 0e985ecaf64..0c444989f6d 100644 --- a/chromium/ash/public/interfaces/menu.mojom +++ b/chromium/ash/public/interfaces/menu.mojom @@ -66,3 +66,9 @@ struct MenuItem { int64 radio_group_id; // The radio group id. MenuSeparatorType separator_type; // The separator type. }; + +// An interface implemented by clients to handle interaction with menus run in +// Ash. +interface MenuDelegate { + MenuItemActivated(int32 command_id); +}; diff --git a/chromium/ash/public/interfaces/multi_user_window_manager.mojom b/chromium/ash/public/interfaces/multi_user_window_manager.mojom new file mode 100644 index 00000000000..390a386ef9e --- /dev/null +++ b/chromium/ash/public/interfaces/multi_user_window_manager.mojom @@ -0,0 +1,45 @@ +// 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"; + +// Used to assign windows to user accounts so that ash shows the appropriate set +// of windows based on the active user. +interface MultiUserWindowManager { + SetClient(associated MultiUserWindowManagerClient client); + + // Associates a window with an account. If |show_for_current_user| is true, + // the window is associated with |account_id|, but is shown for the currently + // active user. + SetWindowOwner(uint64 window_id, + signin.mojom.AccountId account_id, + bool show_for_current_user); + + // Shows a previously registered window for the specified account. + ShowWindowForUser(uint64 window_id, + signin.mojom.AccountId account_id); +}; + +interface MultiUserWindowManagerClient { + // Called when the owner of a window supplied to SetWindowOwner() changes. + // |was_minimized| is true if the window was minimized. |teleported| is true + // if the window was not on the desktop of the current user. + OnWindowOwnerEntryChanged(uint64 window_id, + signin.mojom.AccountId account_id, + bool was_minimized, + bool teleported); + + // Called when the active account changes. This is followed by + // OnTransitionUserShelfToNewAccount() and OnDidSwitchActiveAccount(). + OnWillSwitchActiveAccount(signin.mojom.AccountId account_id); + + // Called at the time when the user's shelf should transition to the account + // supplied to OnWillSwitchActiveAccount(). + OnTransitionUserShelfToNewAccount(); + + // Called when the active account change is complete. + OnDidSwitchActiveAccount(); +}; diff --git a/chromium/ash/public/interfaces/new_window.mojom b/chromium/ash/public/interfaces/new_window.mojom index 2c1231ab55f..6a25b7aea3e 100644 --- a/chromium/ash/public/interfaces/new_window.mojom +++ b/chromium/ash/public/interfaces/new_window.mojom @@ -10,12 +10,6 @@ import "url/mojom/url.mojom"; // An exported object in ash which lets an ash consumer set a client interface. interface NewWindowController { SetClient(associated NewWindowClient client); - - // TODO(crbug.com/755448): Remove this when the new shortcut viewer is - // enabled. - // Shows the keyboard shortcut overlay. TODO(mash): this calls the client - // function of the same name below, but it should be implemented inside ash. - ShowKeyboardOverlay(); }; // A delegate interface that an ash user sends to ash to handle certain window @@ -44,11 +38,6 @@ interface NewWindowClient { // Invoked when the user uses Shift+Ctrl+T to restore the closed tab. RestoreTab(); - // TODO(crbug.com/755448): Remove this when the new shortcut viewer is - // enabled. - // Shows the keyboard shortcut overlay. - ShowKeyboardOverlay(); - // Show the keyboard shortcut viewer. ShowKeyboardShortcutViewer(); diff --git a/chromium/ash/public/interfaces/shell_test_api.mojom b/chromium/ash/public/interfaces/shell_test_api.mojom index e17c998bc25..bab9b461c31 100644 --- a/chromium/ash/public/interfaces/shell_test_api.mojom +++ b/chromium/ash/public/interfaces/shell_test_api.mojom @@ -15,4 +15,15 @@ interface ShellTestApi { // Enables the keyboard and associates it with the primary root window // controller. In tablet mode, enables the virtual keyboard. EnableVirtualKeyboard() => (); + + // Tells the SplitViewController to snap the given window to the left or + // right. The client name is used to find the client's WindowTree. + SnapWindowInSplitView(string client_name, uint64 window_id, bool left) => (); + + // Fullscreens the active window, as if the user had pressed the hardware + // fullscreen button. + ToggleFullscreen() => (); + + // Enters or exits overview mode. + ToggleOverviewMode() => (); }; diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom index b5cbdfd06e8..e517a3215d1 100644 --- a/chromium/ash/public/interfaces/system_tray.mojom +++ b/chromium/ash/public/interfaces/system_tray.mojom @@ -7,6 +7,15 @@ module ash.mojom; import "ash/public/interfaces/update.mojom"; import "mojo/public/mojom/base/string16.mojom"; +// The locale info to show in the locale feature 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; +}; + // Allows clients (e.g. Chrome browser) to control the ash system tray menu. interface SystemTray { // Sets the client interface. @@ -33,6 +42,10 @@ interface SystemTray { // tracing is running. SetPerformanceTracingIconVisible(bool visible); + // Sets the list of supported UI locales. |current_locale_iso_code| refers to + // the locale currently used by the UI. + SetLocaleList(array<LocaleInfo> locale_list, string current_locale_iso_code); + // Shows an icon in the system tray or a notification on the unified system // menu indicating that a software update is available. Once shown, the icon // or the notification persists until reboot. @@ -166,4 +179,8 @@ interface SystemTrayClient { // Attempts to restart the system for update. RequestRestartForUpdate(); + + // Sets the UI locale to |locale_iso_code| and exit the session to take + // effect. + SetLocaleAndExit(string locale_iso_code); }; diff --git a/chromium/ash/public/interfaces/system_tray_test_api.mojom b/chromium/ash/public/interfaces/system_tray_test_api.mojom index fca24a4b76b..11973707e5b 100644 --- a/chromium/ash/public/interfaces/system_tray_test_api.mojom +++ b/chromium/ash/public/interfaces/system_tray_test_api.mojom @@ -9,7 +9,7 @@ import "mojo/public/mojom/base/string16.mojom"; // Top-level items in the system tray bubble. // TODO(jamescook): Consolidate with SystemTrayItem::UmaType. enum TrayItem { - kEnterprise, + kAccessibility, kNetwork, }; @@ -36,7 +36,11 @@ interface SystemTrayTestApi { ShowDetailedView(TrayItem item) => (); // Returns true if the view exists in the bubble and is visible. - IsBubbleViewVisible(int32 view_id) => (bool visible); + // If |open_tray| is true, it also opens system tray bubble. + IsBubbleViewVisible(int32 view_id, bool open_tray) => (bool visible); + + // Clicks the view |view_id|. + ClickBubbleView(int32 view_id) => (); // Returns the tooltip for a bubble view, or the empty string if the view // does not exist. diff --git a/chromium/ash/public/interfaces/user_info.mojom b/chromium/ash/public/interfaces/user_info.mojom index 06aa2445984..c40bb516f12 100644 --- a/chromium/ash/public/interfaces/user_info.mojom +++ b/chromium/ash/public/interfaces/user_info.mojom @@ -5,6 +5,7 @@ module ash.mojom; import "components/account_id/interfaces/account_id.mojom"; +import "mojo/public/mojom/base/token.mojom"; import "ui/gfx/image/mojo/image.mojom"; // Matches user_manager::UserType. @@ -49,7 +50,7 @@ struct UserAvatar { struct UserInfo { UserType type; signin.mojom.AccountId account_id; - string service_user_id; + mojo_base.mojom.Token? service_instance_group; string display_name; string display_email; UserAvatar avatar; @@ -61,4 +62,6 @@ struct UserInfo { bool is_ephemeral; // True if the user is also the device owner. bool is_device_owner; + // True if the user has a gaia account. + bool has_gaia_account; }; diff --git a/chromium/ash/public/interfaces/voice_interaction_controller.mojom b/chromium/ash/public/interfaces/voice_interaction_controller.mojom index 6c1a9d21c60..e8b85eddb64 100644 --- a/chromium/ash/public/interfaces/voice_interaction_controller.mojom +++ b/chromium/ash/public/interfaces/voice_interaction_controller.mojom @@ -109,19 +109,6 @@ interface VoiceInteractionController { // Called when the launch with mic open state is changed. NotifyLaunchWithMicOpen(bool launch_with_mic_open); - // Return if the voice interaction setting is enabled/disabled. - IsSettingEnabled() => (bool enabled); - - // Return the voice interaction setup complete status. - IsSetupCompleted() => (bool completed); - - // Return if the user has granted permission to access screen "context", the - // text and graphics content that is currently on screen. - IsContextEnabled() => (bool enabled); - - // Return the voice interaction hotword listening status. - IsHotwordEnabled() => (bool enabled); - // Add an observer. AddObserver(VoiceInteractionObserver observer); }; diff --git a/chromium/ash/public/interfaces/web_contents_manager.mojom b/chromium/ash/public/interfaces/web_contents_manager.mojom deleted file mode 100644 index 65037d9ab51..00000000000 --- a/chromium/ash/public/interfaces/web_contents_manager.mojom +++ /dev/null @@ -1,67 +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"; -import "mojo/public/mojom/base/unguessable_token.mojom"; -import "ui/base/mojo/window_open_disposition.mojom"; -import "ui/gfx/geometry/mojo/geometry.mojom"; -import "url/mojom/url.mojom"; - -// Interface for a class which is responsible for managing a WebContents in -// chrome/browser and owning associated resources until they are explicity -// released using the provided APIs. -interface WebContentsManager { - // Creates and manages WebContents as defined by the specified |params|. Any - // call to ManageWebContents should be paired with a corresponding call to - // ReleaseWebContents when the resources are no longer needed. To this end, - // the caller must supply an identifier by which to uniquely identify - // WebContents resources. When the rendered content is ready for embedding, - // the supplied callback will be run providing an unguessable |embed_token|. - // In the event of failure, the callback will still be run but no - // |embed_token| will be provided. - ManageWebContents(mojo_base.mojom.UnguessableToken id_token, - ManagedWebContentsParams params) - => (mojo_base.mojom.UnguessableToken? embed_token); - - // Releases any resources associated with the WebContents uniquely identified - // by |id_token|. - ReleaseWebContents(mojo_base.mojom.UnguessableToken id_token); - - // Releases any resources associated with any WebContents uniquely identified - // by one of the specified |id_tokens|. - ReleaseAllWebContents(array<mojo_base.mojom.UnguessableToken> id_tokens); - - // Navigates the WebContents uniquely identified by |id_token| back relative - // to the current history entry. The callback returns true if the WebContents - // were navigated, false otherwise. - NavigateWebContentsBack(mojo_base.mojom.UnguessableToken id_token) - => (bool navigated); -}; - -// Defines parameters for a managed WebContents. -struct ManagedWebContentsParams { - // The account identifier for the profile. - signin.mojom.AccountId account_id; - // The initial URL. - url.mojom.Url url; - // The minimum desired size. Omitting defaults to (1, 1). - gfx.mojom.Size? min_size_dip; - // The maximum desired size. Omitting defaults to (INT_MAX, INT_MAX). - gfx.mojom.Size? max_size_dip; - // An optional delegate to handle top level browser requests. If omitted, top - // level browser requests will be handled according to default behavior. - ManagedWebContentsOpenUrlDelegate? open_url_delegate_ptr_info; -}; - -// Interface for a delegate to handle top level browser requests for a -// managed WebContents. -interface ManagedWebContentsOpenUrlDelegate { - // Invoked on a top level browser request to navigate to |url| with the - // specified window open |disposition|. Return false to consume the - // navigation attempt or true to allow it to continue. - ShouldOpenUrlFromTab(url.mojom.Url url, - ui.mojom.WindowOpenDisposition disposition) => (bool should_open); -}; diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 82fed09a6b8..6a8aa488f1d 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -176,10 +176,6 @@ aggregate_vector_icons("ash_vector_icons") { "system_power_button_menu_power_off.icon", "system_power_button_menu_sign_out.icon", "system_tray_accessibility.icon", - "system_tray_battery_alert.icon", - "system_tray_battery_bolt.icon", - "system_tray_battery_unreliable.icon", - "system_tray_battery_x.icon", "system_tray_caps_lock.icon", "system_tray_cast.icon", "system_tray_do_not_disturb.icon", @@ -218,6 +214,7 @@ aggregate_vector_icons("ash_vector_icons") { "unified_menu_info.icon", "unified_menu_keyboard_brightness.icon", "unified_menu_keyboard.icon", + "unified_menu_locale.icon", "unified_menu_lock.icon", "unified_menu_managed.icon", "unified_menu_more.icon", diff --git a/chromium/ash/system/message_center/arc/BUILD.gn b/chromium/ash/system/message_center/arc/BUILD.gn index b3e4846abaa..59ebaaf3880 100644 --- a/chromium/ash/system/message_center/arc/BUILD.gn +++ b/chromium/ash/system/message_center/arc/BUILD.gn @@ -30,6 +30,7 @@ static_library("arc") { ] deps = [ + "//ash/public/cpp:cpp", "//base", "//components/account_id", "//components/arc:arc_metrics_constants", |