From 51f6c2793adab2d864b3d2b360000ef8db1d3e92 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 10 Dec 2018 16:19:40 +0100 Subject: BASELINE: Update Chromium to 71.0.3578.93 Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor --- chromium/ash/BUILD.gn | 187 ++++++++++++--------- chromium/ash/components/quick_launch/BUILD.gn | 1 + chromium/ash/public/cpp/BUILD.gn | 27 ++- chromium/ash/public/cpp/vector_icons/BUILD.gn | 4 + chromium/ash/public/interfaces/BUILD.gn | 7 +- .../interfaces/accessibility_controller.mojom | 37 ++++ chromium/ash/public/interfaces/app_list.mojom | 5 + .../interfaces/ash_message_center_controller.mojom | 3 + .../ash/public/interfaces/ash_window_manager.mojom | 30 ++++ .../public/interfaces/client_image_registry.mojom | 24 --- .../interfaces/event_rewriter_controller.mojom | 6 + .../public/interfaces/keyboard_controller.mojom | 35 ++++ chromium/ash/public/interfaces/login_screen.mojom | 41 +++-- .../ash/public/interfaces/login_user_info.mojom | 4 + chromium/ash/public/interfaces/new_window.mojom | 6 +- .../ash/public/interfaces/shell_test_api.mojom | 4 + chromium/ash/public/interfaces/system_tray.mojom | 3 + .../interfaces/voice_interaction_controller.mojom | 7 +- .../public/interfaces/web_contents_manager.mojom | 9 +- .../ash/public/interfaces/window_actions.mojom | 10 -- .../ash/public/interfaces/window_properties.mojom | 56 +++--- chromium/ash/public/interfaces/window_style.mojom | 13 -- chromium/ash/resources/vector_icons/BUILD.gn | 7 +- chromium/ash/strings/BUILD.gn | 2 + chromium/ash/system/message_center/arc/BUILD.gn | 1 + 25 files changed, 343 insertions(+), 186 deletions(-) create mode 100644 chromium/ash/public/interfaces/ash_window_manager.mojom delete mode 100644 chromium/ash/public/interfaces/client_image_registry.mojom create mode 100644 chromium/ash/public/interfaces/keyboard_controller.mojom delete mode 100644 chromium/ash/public/interfaces/window_actions.mojom delete mode 100644 chromium/ash/public/interfaces/window_style.mojom (limited to 'chromium/ash') diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index c1f7df74499..d130455d8a8 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -42,11 +42,7 @@ component("ash") { "display/screen_orientation_controller.h", "events/event_rewriter_controller.h", "focus_cycler.h", - "frame/caption_buttons/frame_back_button.h", - "frame/caption_buttons/frame_caption_button_container_view.h", - "frame/custom_frame_header.h", - "frame/default_frame_header.h", - "frame/frame_header_util.h", + "frame/ash_frame_caption_controller.h", "frame/header_view.h", "frame/non_client_frame_view_ash.h", "frame/wide_frame_view.h", @@ -75,9 +71,9 @@ component("ash") { "wm/mru_window_tracker.h", "wm/overview/window_selector_controller.h", "wm/splitview/split_view_controller.h", - "wm/tablet_mode/tablet_mode_app_window_drag_controller.h", "wm/tablet_mode/tablet_mode_controller.h", "wm/tablet_mode/tablet_mode_observer.h", + "wm/tablet_mode/tablet_mode_window_drag_delegate.h", "wm/window_finder.h", "wm/window_positioner.h", "wm/window_positioning_utils.h", @@ -96,11 +92,7 @@ component("ash") { "accelerators/accelerator_confirmation_dialog.cc", "accelerators/accelerator_confirmation_dialog.h", "accelerators/accelerator_controller.cc", - "accelerators/accelerator_delegate.cc", - "accelerators/accelerator_delegate.h", "accelerators/accelerator_ids.h", - "accelerators/accelerator_router.cc", - "accelerators/accelerator_router.h", "accelerators/accelerator_table.cc", "accelerators/accelerator_table.h", "accelerators/ash_focus_manager_factory.cc", @@ -113,6 +105,8 @@ component("ash") { "accelerators/key_hold_detector.h", "accelerators/magnifier_key_scroller.cc", "accelerators/magnifier_key_scroller.h", + "accelerators/pre_target_accelerator_handler.cc", + "accelerators/pre_target_accelerator_handler.h", "accelerators/spoken_feedback_toggler.cc", "accelerators/spoken_feedback_toggler.h", "accessibility/accessibility_controller.cc", @@ -169,6 +163,8 @@ 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", @@ -185,23 +181,35 @@ component("ash") { "assistant/model/assistant_query.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", + "assistant/model/assistant_ui_element.cc", "assistant/model/assistant_ui_element.h", "assistant/model/assistant_ui_model.cc", "assistant/model/assistant_ui_model.h", "assistant/model/assistant_ui_model_observer.h", + "assistant/ui/assistant_background_layer.cc", + "assistant/ui/assistant_background_layer.h", "assistant/ui/assistant_container_view.cc", "assistant/ui/assistant_container_view.h", + "assistant/ui/assistant_container_view_animator.cc", + "assistant/ui/assistant_container_view_animator.h", + "assistant/ui/assistant_container_view_animator_legacy_impl.cc", + "assistant/ui/assistant_container_view_animator_legacy_impl.h", + "assistant/ui/assistant_container_view_focus_traversable.cc", + "assistant/ui/assistant_container_view_focus_traversable.h", "assistant/ui/assistant_main_view.cc", "assistant/ui/assistant_main_view.h", "assistant/ui/assistant_mini_view.cc", "assistant/ui/assistant_mini_view.h", - "assistant/ui/assistant_scroll_view.cc", - "assistant/ui/assistant_scroll_view.h", "assistant/ui/assistant_web_view.cc", "assistant/ui/assistant_web_view.h", + "assistant/ui/base/assistant_button.cc", + "assistant/ui/base/assistant_button.h", + "assistant/ui/base/assistant_scroll_view.cc", + "assistant/ui/base/assistant_scroll_view.h", "assistant/ui/caption_bar.cc", "assistant/ui/caption_bar.h", "assistant/ui/dialog_plate/action_view.cc", @@ -234,16 +242,18 @@ component("ash") { "assistant/util/assistant_util.h", "assistant/util/deep_link_util.cc", "assistant/util/deep_link_util.h", + "assistant/util/histogram_util.cc", + "assistant/util/histogram_util.h", "assistant/util/views_util.cc", "assistant/util/views_util.h", "autoclick/autoclick_controller.cc", "autoclick/autoclick_controller.h", + "bluetooth_devices_observer.cc", + "bluetooth_devices_observer.h", "cancel_mode.cc", "cancel_mode.h", "cast_config_controller.cc", "cast_config_controller.h", - "client_image_registry.cc", - "client_image_registry.h", "dbus/ash_dbus_services.cc", "dbus/ash_dbus_services.h", "dbus/display_service_provider.cc", @@ -332,6 +342,8 @@ component("ash") { "events/event_rewriter_controller.cc", "events/keyboard_driven_event_rewriter.cc", "events/keyboard_driven_event_rewriter.h", + "events/select_to_speak_event_handler.cc", + "events/select_to_speak_event_handler.h", "events/spoken_feedback_event_rewriter.cc", "events/spoken_feedback_event_rewriter.h", "first_run/desktop_cleaner.cc", @@ -339,21 +351,7 @@ component("ash") { "first_run/first_run_helper.cc", "first_run/first_run_helper.h", "focus_cycler.cc", - "frame/caption_buttons/caption_button_types.h", - "frame/caption_buttons/frame_back_button.cc", - "frame/caption_buttons/frame_caption_button.cc", - "frame/caption_buttons/frame_caption_button.h", - "frame/caption_buttons/frame_caption_button_container_view.cc", - "frame/caption_buttons/frame_size_button.cc", - "frame/caption_buttons/frame_size_button.h", - "frame/caption_buttons/frame_size_button_delegate.h", - "frame/custom_frame_header.cc", - "frame/default_frame_header.cc", - "frame/detached_title_area_renderer.cc", - "frame/detached_title_area_renderer.h", - "frame/frame_header.cc", - "frame/frame_header.h", - "frame/frame_header_util.cc", + "frame/ash_frame_caption_controller.cc", "frame/header_view.cc", "frame/non_client_frame_view_ash.cc", "frame/wide_frame_view.cc", @@ -389,10 +387,13 @@ 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/virtual_keyboard_container_layout_manager.cc", "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", @@ -485,33 +486,10 @@ component("ash") { "magnifier/partial_magnification_controller.h", "media_controller.cc", "media_controller.h", - "message_center/arc_notification_manager_delegate_impl.cc", - "message_center/arc_notification_manager_delegate_impl.h", - "message_center/ash_message_center_lock_screen_controller.cc", - "message_center/ash_message_center_lock_screen_controller.h", - "message_center/message_center_bubble.cc", - "message_center/message_center_bubble.h", - "message_center/message_center_button_bar.cc", - "message_center/message_center_button_bar.h", - "message_center/message_center_controller.cc", - "message_center/message_center_controller.h", - "message_center/message_center_scroll_bar.cc", - "message_center/message_center_scroll_bar.h", - "message_center/message_center_style.h", - "message_center/message_center_ui_controller.cc", - "message_center/message_center_ui_controller.h", - "message_center/message_center_ui_delegate.h", - "message_center/message_center_view.cc", - "message_center/message_center_view.h", - "message_center/message_list_view.cc", - "message_center/message_list_view.h", - "message_center/notifier_settings_view.cc", - "message_center/notifier_settings_view.h", "metrics/demo_session_metrics_recorder.cc", "metrics/demo_session_metrics_recorder.h", "metrics/desktop_task_switch_metric_recorder.cc", "metrics/desktop_task_switch_metric_recorder.h", - "metrics/gesture_action_type.h", "metrics/login_metrics_recorder.cc", "metrics/login_metrics_recorder.h", "metrics/pointer_metrics_recorder.cc", @@ -551,6 +529,8 @@ component("ash") { "rotator/screen_rotation_animator_observer.h", "rotator/window_rotation.cc", "rotator/window_rotation.h", + "scoped_animation_disabler.cc", + "scoped_animation_disabler.h", "scoped_root_window_for_new_windows.cc", "scoped_root_window_for_new_windows.h", "screen_util.cc", @@ -672,6 +652,10 @@ component("ash") { "system/bluetooth/tray_bluetooth.h", "system/bluetooth/tray_bluetooth_helper.cc", "system/bluetooth/tray_bluetooth_helper.h", + "system/bluetooth/tray_bluetooth_helper_experimental.cc", + "system/bluetooth/tray_bluetooth_helper_experimental.h", + "system/bluetooth/tray_bluetooth_helper_legacy.cc", + "system/bluetooth/tray_bluetooth_helper_legacy.h", "system/bluetooth/unified_bluetooth_detailed_view_controller.cc", "system/bluetooth/unified_bluetooth_detailed_view_controller.h", "system/brightness/brightness_controller_chromeos.cc", @@ -733,16 +717,48 @@ component("ash") { "system/locale/locale_notification_controller.h", "system/media_security/multi_profile_media_tray_item.cc", "system/media_security/multi_profile_media_tray_item.h", + "system/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", + "system/message_center/ash_message_center_lock_screen_controller.h", "system/message_center/ash_popup_alignment_delegate.cc", "system/message_center/ash_popup_alignment_delegate.h", "system/message_center/fullscreen_notification_blocker.cc", "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", + "system/message_center/message_center_scroll_bar.h", + "system/message_center/message_center_style.h", + "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", + "system/message_center/unified_message_list_view.h", "system/model/clock_model.cc", "system/model/clock_model.h", "system/model/enterprise_domain_model.cc", @@ -755,6 +771,8 @@ component("ash") { "system/model/tracing_model.h", "system/model/update_model.cc", "system/model/update_model.h", + "system/model/virtual_keyboard_model.cc", + "system/model/virtual_keyboard_model.h", "system/network/auto_connect_notifier.cc", "system/network/auto_connect_notifier.h", "system/network/network_feature_pod_button.cc", @@ -954,6 +972,8 @@ component("ash") { "system/tray/tray_background_view.cc", "system/tray/tray_background_view.h", "system/tray/tray_bubble_base.h", + "system/tray/tray_bubble_view.cc", + "system/tray/tray_bubble_view.h", "system/tray/tray_bubble_wrapper.cc", "system/tray/tray_bubble_wrapper.h", "system/tray/tray_constants.cc", @@ -1019,8 +1039,6 @@ component("ash") { "system/unified/top_shortcuts_view.h", "system/unified/unified_detailed_view_delegate.cc", "system/unified/unified_detailed_view_delegate.h", - "system/unified/unified_message_center_view.cc", - "system/unified/unified_message_center_view.h", "system/unified/unified_notifier_settings_controller.cc", "system/unified/unified_notifier_settings_controller.h", "system/unified/unified_slider_bubble_controller.cc", @@ -1119,8 +1137,6 @@ component("ash") { "wm/drag_window_controller.cc", "wm/drag_window_controller.h", "wm/drag_window_resizer.cc", - "wm/drag_window_resizer_mash.cc", - "wm/drag_window_resizer_mash.h", "wm/event_client_impl.cc", "wm/event_client_impl.h", "wm/focus_rules.cc", @@ -1147,9 +1163,8 @@ component("ash") { "wm/lock_window_state.cc", "wm/lock_window_state.h", "wm/mru_window_tracker.cc", + "wm/native_cursor_manager_ash.cc", "wm/native_cursor_manager_ash.h", - "wm/native_cursor_manager_ash_classic.cc", - "wm/native_cursor_manager_ash_classic.h", "wm/non_client_frame_controller.cc", "wm/non_client_frame_controller.h", "wm/overlay_event_filter.cc", @@ -1158,6 +1173,8 @@ component("ash") { "wm/overlay_layout_manager.h", "wm/overview/cleanup_animation_observer.cc", "wm/overview/cleanup_animation_observer.h", + "wm/overview/drop_target_view.cc", + "wm/overview/drop_target_view.h", "wm/overview/overview_animation_type.h", "wm/overview/overview_utils.cc", "wm/overview/overview_utils.h", @@ -1171,6 +1188,8 @@ component("ash") { "wm/overview/scoped_overview_animation_settings.h", "wm/overview/scoped_transform_overview_window.cc", "wm/overview/scoped_transform_overview_window.h", + "wm/overview/start_animation_observer.cc", + "wm/overview/start_animation_observer.h", "wm/overview/window_grid.cc", "wm/overview/window_grid.h", "wm/overview/window_selector.cc", @@ -1181,8 +1200,6 @@ component("ash") { "wm/overview/window_selector_item.h", "wm/property_util.cc", "wm/property_util.h", - "wm/resize_handle_window_targeter.cc", - "wm/resize_handle_window_targeter.h", "wm/resize_shadow.cc", "wm/resize_shadow.h", "wm/resize_shadow_controller.cc", @@ -1222,9 +1239,8 @@ component("ash") { "wm/system_modal_container_layout_manager.h", "wm/system_wallpaper_controller.cc", "wm/system_wallpaper_controller.h", - "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h", - "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", - "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", + "wm/tablet_mode/internal_input_devices_event_blocker.cc", + "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_app_window_drag_controller.cc", @@ -1251,7 +1267,6 @@ component("ash") { "wm/video_detector.h", "wm/widget_finder.cc", "wm/widget_finder.h", - "wm/window_animation_types.h", "wm/window_animations.cc", "wm/window_animations.h", "wm/window_cycle_controller.cc", @@ -1300,8 +1315,6 @@ component("ash") { "wm/workspace/two_step_edge_cycler.h", "wm/workspace/workspace_event_handler.cc", "wm/workspace/workspace_event_handler.h", - "wm/workspace/workspace_event_handler_classic.cc", - "wm/workspace/workspace_event_handler_classic.h", "wm/workspace/workspace_layout_manager.cc", "wm/workspace/workspace_layout_manager.h", "wm/workspace/workspace_types.h", @@ -1310,6 +1323,8 @@ component("ash") { "wm/workspace_controller.h", "ws/ash_gpu_interface_provider.cc", "ws/ash_gpu_interface_provider.h", + "ws/ash_window_manager.cc", + "ws/ash_window_manager.h", "ws/window_service_delegate_impl.cc", "ws/window_service_delegate_impl.h", "ws/window_service_owner.cc", @@ -1326,8 +1341,8 @@ component("ash") { "//ash/strings", "//ash/wayland", "//components/discardable_memory/public/interfaces", - "//mash/public/mojom", "//mojo/public/cpp/system", + "//services/device/public/mojom", "//services/service_manager/embedder", "//services/ws:host", "//services/ws:lib", @@ -1371,6 +1386,7 @@ component("ash") { "//chromeos/components/proximity_auth/logging", "//chromeos/services/assistant/public/mojom", "//chromeos/services/multidevice_setup/public/mojom", + "//chromeos/strings", "//components/account_id", "//components/device_event_log", "//components/discardable_memory/service", @@ -1394,12 +1410,15 @@ component("ash") { "//gpu/command_buffer/client:gles2_interface", "//media", "//net", + "//services/content/public/cpp", "//services/data_decoder/public/cpp", "//services/preferences/public/cpp", "//services/service_manager/public/cpp", "//services/ws/gpu_host", + "//services/ws/public/cpp/host", "//services/ws/public/cpp/input_devices:input_device_controller", "//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", @@ -1414,7 +1433,6 @@ component("ash") { "//ui/chromeos", "//ui/chromeos/events", "//ui/chromeos/resources", - "//ui/chromeos/strings", "//ui/compositor", "//ui/compositor_extra", "//ui/display", @@ -1472,8 +1490,6 @@ component("ash") { component("ash_with_content") { sources = [ "content/ash_with_content_export.h", - "content/content_gpu_interface_provider.cc", - "content/content_gpu_interface_provider.h", "content/keyboard_overlay/keyboard_overlay_delegate.cc", "content/keyboard_overlay/keyboard_overlay_delegate.h", "content/keyboard_overlay/keyboard_overlay_view.cc", @@ -1745,6 +1761,7 @@ test("ash_unittests") { "drag_drop/drag_drop_tracker_unittest.cc", "drag_drop/drag_image_view_unittest.cc", "events/keyboard_driven_event_rewriter_unittest.cc", + "events/select_to_speak_event_handler_unittest.cc", "events/spoken_feedback_event_rewriter_unittest.cc", "extended_desktop_unittest.cc", "first_run/first_run_helper_unittest.cc", @@ -1759,6 +1776,7 @@ test("ash_unittests") { "ime/ime_controller_unittest.cc", "ime/ime_focus_handler_unittest.cc", "keyboard/arc/arc_input_method_surface_manager_unittest.cc", + "keyboard/ash_keyboard_controller_unittest.cc", "keyboard/virtual_keyboard_controller_unittest.cc", "keyboard/virtual_keyboard_unittest.cc", "laser/laser_pointer_controller_unittest.cc", @@ -1781,6 +1799,7 @@ test("ash_unittests") { "login/ui/login_keyboard_test_base.h", "login/ui/login_password_view_test.cc", "login/ui/login_pin_view_unittest.cc", + "login/ui/login_public_account_user_view_unittest.cc", "login/ui/login_test_base.cc", "login/ui/login_test_base.h", "login/ui/login_test_utils.cc", @@ -1793,10 +1812,6 @@ test("ash_unittests") { "magnifier/magnifier_test_utils.cc", "magnifier/magnifier_test_utils.h", "magnifier/partial_magnification_controller_unittest.cc", - "message_center/message_center_ui_controller_unittest.cc", - "message_center/message_center_view_unittest.cc", - "message_center/message_list_view_unittest.cc", - "message_center/notifier_settings_view_unittest.cc", "metrics/demo_session_metrics_recorder_unittest.cc", "metrics/desktop_task_switch_metric_recorder_unittest.cc", "metrics/login_metrics_recorder_unittest.cc", @@ -1837,7 +1852,7 @@ test("ash_unittests") { "system/accessibility/select_to_speak_tray_unittest.cc", "system/audio/tray_audio_unittest.cc", "system/bluetooth/bluetooth_power_controller_unittest.cc", - "system/bluetooth/tray_bluetooth_helper_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", @@ -1854,8 +1869,14 @@ test("ash_unittests") { "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_list_view_unittest.cc", "system/network/auto_connect_notifier_unittest.cc", "system/network/network_icon_unittest.cc", "system/network/sms_observer_unittest.cc", @@ -1951,6 +1972,8 @@ test("ash_unittests") { "wm/overlay_event_filter_unittest.cc", "wm/overlay_layout_manager_unittest.cc", "wm/overview/cleanup_animation_observer_unittest.cc", + "wm/overview/start_animation_observer_unittest.cc", + "wm/overview/window_selector_controller_unittest.cc", "wm/overview/window_selector_unittest.cc", "wm/resize_shadow_and_cursor_unittest.cc", "wm/root_window_layout_manager_unittest.cc", @@ -1983,6 +2006,7 @@ test("ash_unittests") { "wm/workspace/workspace_layout_manager_unittest.cc", "wm/workspace/workspace_window_resizer_unittest.cc", "wm/workspace_controller_unittest.cc", + "ws/ash_window_manager_unittest.cc", "ws/window_service_delegate_impl_unittest.cc", ] configs += [ @@ -2067,6 +2091,7 @@ test("ash_unittests") { "//ui/gfx/geometry", "//ui/gl:test_support", "//ui/keyboard", + "//ui/keyboard:mojom", "//ui/keyboard:test_support", "//ui/message_center", "//ui/message_center:test_support", @@ -2176,6 +2201,7 @@ static_library("test_support_with_content") { "//ash:ash_with_content", "//content/public/browser", "//content/test:test_support", + "//services/network:test_support", "//skia", "//ui/views/controls/webview", ] @@ -2202,6 +2228,7 @@ static_library("test_support_common") { "display/mirror_window_test_api.h", "display/screen_orientation_controller_test_api.cc", "display/screen_orientation_controller_test_api.h", + "drag_drop/drag_drop_controller_test_api.h", "highlighter/highlighter_controller_test_api.cc", "highlighter/highlighter_controller_test_api.h", "ime/test_ime_controller_client.cc", @@ -2234,8 +2261,6 @@ static_library("test_support_common") { "session/test_session_controller_client.h", "shelf/overflow_bubble_view_test_api.cc", "shelf/overflow_bubble_view_test_api.h", - "shelf/overflow_button_test_api.cc", - "shelf/overflow_button_test_api.h", "shelf/shelf_button_pressed_metric_tracker_test_api.cc", "shelf/shelf_button_pressed_metric_tracker_test_api.h", "shelf/shelf_test_api.cc", @@ -2333,9 +2358,12 @@ static_library("test_support_common") { "//components/user_manager:user_manager", "//components/viz/test:test_support", "//device/bluetooth", + "//services/device/public/mojom", "//services/ws:test_support", "//services/ws/public/cpp", + "//services/ws/public/cpp/host", "//services/ws/public/cpp/input_devices", + "//services/ws/public/cpp/input_devices:test_support", "//services/ws/public/mojom", "//skia", "//testing/gtest", @@ -2385,6 +2413,7 @@ static_library("interactive_ui_test_support") { "//testing/gtest", "//ui/aura", "//ui/base", + "//ui/base:test_support", "//ui/gl:test_support", ] } @@ -2403,8 +2432,6 @@ service("ash_service") { "//services/service_manager/public/cpp", ] - # TODO(beng): This target relies on //mash/session, but there is a cycle so we - # can't state that dependency here. data_deps = [ ":ash_service_resources", ":ash_service_resources_200", @@ -2424,6 +2451,7 @@ repack("ash_service_resources") { sources = [ "$root_gen_dir/ash/components/resources/ash_components_resources_100_percent.pak", "$root_gen_dir/ash/strings/ash_strings_en-US.pak", + "$root_gen_dir/chromeos/strings/chromeos_strings_en-US.pak", "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak", "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak", "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", @@ -2434,6 +2462,7 @@ repack("ash_service_resources") { deps = [ "//ash/components/resources", "//ash/strings", + "//chromeos/strings", "//ui/chromeos/resources", "//ui/chromeos/strings", "//ui/resources", diff --git a/chromium/ash/components/quick_launch/BUILD.gn b/chromium/ash/components/quick_launch/BUILD.gn index 5d7a57b9008..e5049245bc9 100644 --- a/chromium/ash/components/quick_launch/BUILD.gn +++ b/chromium/ash/components/quick_launch/BUILD.gn @@ -15,6 +15,7 @@ source_set("lib") { ] deps = [ + "//ash/public/cpp", "//base", "//mash/public/mojom", "//mojo/public/cpp/bindings", diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 5b9aec58dd9..98ed33303c6 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -32,6 +32,8 @@ component("cpp") { "app_list/tokenized_string_match.h", "app_menu_constants.h", "app_types.h", + "ash_client.cc", + "ash_client.h", "ash_constants.h", "ash_features.cc", "ash_features.h", @@ -45,12 +47,27 @@ component("cpp") { "ash_typography.cc", "ash_typography.h", "ash_view_ids.h", - "config.h", + "caption_buttons/caption_button_model.h", + "caption_buttons/caption_button_types.h", + "caption_buttons/frame_back_button.cc", + "caption_buttons/frame_back_button.h", + "caption_buttons/frame_caption_button.cc", + "caption_buttons/frame_caption_button.h", + "caption_buttons/frame_caption_button_container_view.cc", + "caption_buttons/frame_caption_button_container_view.h", + "caption_buttons/frame_caption_delegate.h", + "caption_buttons/frame_size_button.cc", + "caption_buttons/frame_size_button.h", + "caption_buttons/frame_size_button_delegate.h", + "default_frame_header.cc", + "default_frame_header.h", "default_scale_factor_retriever.cc", "default_scale_factor_retriever.h", + "frame_header.cc", + "frame_header.h", "frame_utils.cc", "frame_utils.h", - "immersive/immersive_context.cc", + "gesture_action_type.h", "immersive/immersive_context.h", "immersive/immersive_focus_watcher.h", "immersive/immersive_fullscreen_controller.cc", @@ -90,20 +107,22 @@ component("cpp") { "shell_window_ids.h", "stylus_utils.cc", "stylus_utils.h", + "tablet_mode.cc", + "tablet_mode.h", "wallpaper_types.h", + "window_animation_types.h", "window_pin_type.cc", "window_pin_type.h", "window_properties.cc", "window_properties.h", "window_state_type.cc", "window_state_type.h", - "window_style.cc", - "window_style.h", ] defines = [ "ASH_PUBLIC_IMPLEMENTATION" ] deps = [ + "//ash/public/cpp/vector_icons", "//chromeos:power_manager_proto", "//components/prefs", "//services/ws/public/mojom", diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn index 7f15d7c0e47..657053cdb0a 100644 --- a/chromium/ash/public/cpp/vector_icons/BUILD.gn +++ b/chromium/ash/public/cpp/vector_icons/BUILD.gn @@ -15,6 +15,10 @@ aggregate_vector_icons("ash_public_vector_icons") { "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", diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn index f03b956259e..3a2b26ca058 100644 --- a/chromium/ash/public/interfaces/BUILD.gn +++ b/chromium/ash/public/interfaces/BUILD.gn @@ -18,12 +18,12 @@ mojom("interfaces_internal") { "app_list.mojom", "ash_display_controller.mojom", "ash_message_center_controller.mojom", + "ash_window_manager.mojom", "assistant_controller.mojom", "assistant_image_downloader.mojom", "assistant_setup.mojom", "assistant_volume_control.mojom", "cast_config.mojom", - "client_image_registry.mojom", "constants.mojom", "cros_display_config.mojom", "display_output_protection.mojom", @@ -34,6 +34,7 @@ mojom("interfaces_internal") { "highlighter_controller.mojom", "ime_controller.mojom", "ime_info.mojom", + "keyboard_controller.mojom", "kiosk_app_info.mojom", "locale.mojom", "login_screen.mojom", @@ -59,11 +60,9 @@ mojom("interfaces_internal") { "vpn_list.mojom", "wallpaper.mojom", "web_contents_manager.mojom", - "window_actions.mojom", "window_pin_type.mojom", "window_properties.mojom", "window_state_type.mojom", - "window_style.mojom", ] public_deps = [ @@ -77,11 +76,13 @@ mojom("interfaces_internal") { "//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/gfx/geometry/mojo", "//ui/gfx/image/mojo:interfaces", "//ui/gfx/range/mojo", + "//ui/keyboard:mojom", "//ui/message_center/public/mojo:mojo", "//url/mojom:url_mojom_gurl", ] diff --git a/chromium/ash/public/interfaces/accessibility_controller.mojom b/chromium/ash/public/interfaces/accessibility_controller.mojom index d9cea949231..d34a5f8ab49 100644 --- a/chromium/ash/public/interfaces/accessibility_controller.mojom +++ b/chromium/ash/public/interfaces/accessibility_controller.mojom @@ -6,6 +6,7 @@ module ash.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"; // Alert sent to the accessibility api. @@ -47,6 +48,22 @@ enum AccessibilityPanelState { 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, @@ -59,6 +76,19 @@ enum SelectToSpeakState { kSelectToSpeakStateSpeaking, }; +// 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); +}; + // Interface for ash client (e.g. Chrome) to control and query accessibility // features. interface AccessibilityController { @@ -93,6 +123,13 @@ interface AccessibilityController { // 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); + + // Starts or stops dictation. Records metrics for toggling via SwitchAccess. + ToggleDictationFromSource(DictationToggleSource source); }; // Interface for ash to request accessibility service from its client (e.g. diff --git a/chromium/ash/public/interfaces/app_list.mojom b/chromium/ash/public/interfaces/app_list.mojom index b52c372c518..eafa8839d8f 100644 --- a/chromium/ash/public/interfaces/app_list.mojom +++ b/chromium/ash/public/interfaces/app_list.mojom @@ -70,6 +70,9 @@ struct SearchResultMetadata { // loading and its renderer notifies it // about a new contents size. 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 + // chip view. gfx.mojom.ImageSkia? badge_icon; // The badge icon of this result that // indicates its type, e.g. installable from // PlayStore, installable from WebStore, @@ -359,6 +362,8 @@ interface AppListClient { OnItemUpdated(AppListItemMetadata folder); // Invoked when a "page break" item is added with |id| and |position|. OnPageBreakItemAdded(string id, syncer.mojom.StringOrdinal position); + // Invoked when a "page break" item with |id| is deleted. + OnPageBreakItemDeleted(string id); ////////////////////////////////////////////////////////////////////////////// // Interfaces on voice interaction: diff --git a/chromium/ash/public/interfaces/ash_message_center_controller.mojom b/chromium/ash/public/interfaces/ash_message_center_controller.mojom index af39e4e9aa9..e00069f8554 100644 --- a/chromium/ash/public/interfaces/ash_message_center_controller.mojom +++ b/chromium/ash/public/interfaces/ash_message_center_controller.mojom @@ -55,6 +55,9 @@ interface AshMessageCenterController { // Gets a list of all the notifications in the message center. GetActiveNotifications() => (array notifications); + + // Changes the quiet mode state in the message center. + SetQuietMode(bool enabled); }; // The message center client interface mimics diff --git a/chromium/ash/public/interfaces/ash_window_manager.mojom b/chromium/ash/public/interfaces/ash_window_manager.mojom new file mode 100644 index 00000000000..cc619dd73f6 --- /dev/null +++ b/chromium/ash/public/interfaces/ash_window_manager.mojom @@ -0,0 +1,30 @@ +// 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_constants.mojom"; + +// The previewed snap state for a window, corresponding to the use of a +// PhantomWindowController. +enum SnapDirection { + kNone, // No snap preview. + kLeft, // The phantom window controller is previewing a snap to the left. + kRight, // The phantom window controller is previewing a snap to the left. +}; + +// Interface exposed via WindowTree::BindWindowManagerInterface(). This +// interface is used for functionality specific to Ash that is associated with +// windows created by the window service. +interface AshWindowManager { + AddWindowToTabletMode(uint64 window_id); + + ShowSnapPreview(uint64 window_id, SnapDirection snap); + + CommitSnap(uint64 window_id, SnapDirection snap); + + // Maximizes the window in response to a double click or tap on the HTCAPTION + // area. + MaximizeWindowByCaptionClick(uint64 window_id, ui.mojom.PointerKind pointer); +}; diff --git a/chromium/ash/public/interfaces/client_image_registry.mojom b/chromium/ash/public/interfaces/client_image_registry.mojom deleted file mode 100644 index 74aa2c83cba..00000000000 --- a/chromium/ash/public/interfaces/client_image_registry.mojom +++ /dev/null @@ -1,24 +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 "mojo/public/mojom/base/unguessable_token.mojom"; -import "ui/gfx/image/mojo/image.mojom"; - -interface ClientImageRegistry { - // Tells Ash about an image which the client will later refer to by |token|. - // This allows clients such as Chrome to repeatedly use or reference the same - // image without serializing/deserializing every time. If the token already - // references another icon, this will replace it. - RegisterImage(mojo_base.mojom.UnguessableToken token, - gfx.mojom.ImageSkia icon); - - // Tells Ash that the client which registered the given token and its - // associated image will no longer use the image. This should be called at - // most once for every unique registered token. In the future, if Ash handles - // client restart, this will need to be called automatically for crashed - // clients. - ForgetImage(mojo_base.mojom.UnguessableToken token); -}; diff --git a/chromium/ash/public/interfaces/event_rewriter_controller.mojom b/chromium/ash/public/interfaces/event_rewriter_controller.mojom index e51d39e9918..09b3de1503e 100644 --- a/chromium/ash/public/interfaces/event_rewriter_controller.mojom +++ b/chromium/ash/public/interfaces/event_rewriter_controller.mojom @@ -12,6 +12,9 @@ interface SpokenFeedbackEventRewriterDelegate { // 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. @@ -34,4 +37,7 @@ interface EventRewriterController { // 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_controller.mojom b/chromium/ash/public/interfaces/keyboard_controller.mojom new file mode 100644 index 00000000000..e787a5b1d9d --- /dev/null +++ b/chromium/ash/public/interfaces/keyboard_controller.mojom @@ -0,0 +1,35 @@ +// 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"; +import "ui/keyboard/public/keyboard_config.mojom"; + +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 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. + OnKeyboardVisibleBoundsChanged(gfx.mojom.Rect new_bounds); +}; + +interface KeyboardController { + // Retrieves the current keyboard configuration. + GetKeyboardConfig() => (keyboard.mojom.KeyboardConfig config); + + // Sets the current keyboard configuration. + SetKeyboardConfig(keyboard.mojom.KeyboardConfig config); + + // 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 2837013780c..8337afdfe10 100644 --- a/chromium/ash/public/interfaces/login_screen.mojom +++ b/chromium/ash/public/interfaces/login_screen.mojom @@ -46,8 +46,8 @@ enum OobeDialogState { HIDDEN, }; -// Allows clients (e.g. Chrome browser) to control the ash login/lock/user-add -// screens. +// Allows clients (e.g. the browser process) to send messages to the ash +// login/lock/user-add screens. interface LoginScreen { // Sets the client interface. SetClient(LoginScreenClient client); @@ -61,7 +61,7 @@ interface LoginScreen { ShowLoginScreen() => (bool did_show); // Requests to show error message in the ash lock screen. - // TODO(xiaoyinh): login_attempts is probabaly not needed from chrome, + // TODO(xiaoyinh): login_attempts is probably not needed from chrome, // remove it when we start to count the login attempts in ash lock screen. // |login_attempts|: The number of the login authentication attempts. // |error_text|: The error text to be shown in lock screen. @@ -198,12 +198,16 @@ interface LoginScreen { // Sets if the guest button on the login shelf can be shown during gaia // signin screen. SetShowGuestButtonForGaiaScreen(bool can_show); + + // Transitions focus to the shelf area. If |reverse|, focuses the status area. + FocusLoginShelf(bool reverse); }; // Allows ash lock screen to control a client (e.g. Chrome browser). Requests // often involve preferences or talk to cryptohome that is not available to ash. interface LoginScreenClient { - // Request user authentication in chrome. + // Attempt to authenticate a user with a password or PIN. + // // If auth succeeds: // chrome will hide the lock screen and clear any displayed error messages. // If auth fails: @@ -213,13 +217,25 @@ interface LoginScreenClient { // |authenticated_by_pin|: True if we are using pin to authenticate. // // The result will be set to true if auth was successful, false if not. - AuthenticateUser(signin.mojom.AccountId account_id, - string password, - bool authenticated_by_pin) => (bool auth_success); - - // Request to attempt easy unlock in chrome. - // |account_id|: The account id of the user we are authenticating. - AttemptUnlock(signin.mojom.AccountId account_id); + // + // TODO(jdufault): Extract authenticated_by_pin into a separate mojom method, + // similar to the other Authenticate* methods + AuthenticateUserWithPasswordOrPin( + signin.mojom.AccountId account_id, + string password, + bool authenticated_by_pin) => (bool auth_success); + + // Attempt to authenticate the user with with an external binary. + AuthenticateUserWithExternalBinary(signin.mojom.AccountId account_id) + => (bool auth_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. + // + // TODO(jdufault): Refactor this method to return an auth_success, similar to + // the other auth methods above. + AuthenticateUserWithEasyUnlock(signin.mojom.AccountId account_id); // Request to hard lock the user pod. // |account_id|: The account id of the user in the user pod. @@ -258,6 +274,9 @@ interface LoginScreenClient { // |reverse|: Whether the tab order is reversed. FocusLockScreenApps(bool reverse); + // Passes focus to the OOBE dialog if it is showing. No-op otherwise. + FocusOobeDialog(); + // Show the gaia sign-in dialog. If |can_close| is true, the dialog can be // closed. The value in |prefilled_account| will be used to prefill the // sign-in dialog so the user does not need to type the account email. diff --git a/chromium/ash/public/interfaces/login_user_info.mojom b/chromium/ash/public/interfaces/login_user_info.mojom index 240c968b82a..7fcf4da275c 100644 --- a/chromium/ash/public/interfaces/login_user_info.mojom +++ b/chromium/ash/public/interfaces/login_user_info.mojom @@ -54,6 +54,10 @@ enum FingerprintUnlockState { // 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, }; // Information about the custom icon in the user pod. diff --git a/chromium/ash/public/interfaces/new_window.mojom b/chromium/ash/public/interfaces/new_window.mojom index 98efe466091..2c1231ab55f 100644 --- a/chromium/ash/public/interfaces/new_window.mojom +++ b/chromium/ash/public/interfaces/new_window.mojom @@ -24,8 +24,10 @@ interface NewWindowClient { // Invoked when the user uses Ctrl+T to open a new tab. NewTab(); - // Opens a new tab with the specified URL. - NewTabWithUrl(url.mojom.Url url); + // Opens a new tab with the specified URL. If the |from_user_interaction| + // is true then the page will load with a user activation. This means the + // page will be able to autoplay media without restriction. + NewTabWithUrl(url.mojom.Url url, bool from_user_interaction); // Invoked when the user uses Ctrl-N or Ctrl-Shift-N to open a new window. NewWindow(bool incognito); diff --git a/chromium/ash/public/interfaces/shell_test_api.mojom b/chromium/ash/public/interfaces/shell_test_api.mojom index e059da9712f..e17c998bc25 100644 --- a/chromium/ash/public/interfaces/shell_test_api.mojom +++ b/chromium/ash/public/interfaces/shell_test_api.mojom @@ -11,4 +11,8 @@ interface ShellTestApi { // Enables or disables the tablet mode window manager. EnableTabletModeWindowManager(bool enable); + + // Enables the keyboard and associates it with the primary root window + // controller. In tablet mode, enables the virtual keyboard. + EnableVirtualKeyboard() => (); }; diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom index 4ae5af1625d..b5cbdfd06e8 100644 --- a/chromium/ash/public/interfaces/system_tray.mojom +++ b/chromium/ash/public/interfaces/system_tray.mojom @@ -112,6 +112,9 @@ interface SystemTrayClient { // Shows settings related to input methods. ShowIMESettings(); + // Shows settings related to MultiDevice features. + ShowConnectedDevicesSettings(); + // Shows the about chrome OS page and checks for updates after the page is // loaded. ShowAboutChromeOS(); diff --git a/chromium/ash/public/interfaces/voice_interaction_controller.mojom b/chromium/ash/public/interfaces/voice_interaction_controller.mojom index 203e3dea26c..6c1a9d21c60 100644 --- a/chromium/ash/public/interfaces/voice_interaction_controller.mojom +++ b/chromium/ash/public/interfaces/voice_interaction_controller.mojom @@ -44,7 +44,9 @@ enum AssistantAllowedState { // Disallowed because incognito mode. DISALLOWED_BY_INCOGNITO, // Disallowed because the device is in demo mode. - DISALLOWED_BY_DEMO_MODE + DISALLOWED_BY_DEMO_MODE, + // Disallowed because the device is in public session. + DISALLOWED_BY_PUBLIC_SESSION }; // Allows observing changes to voice interaction status and settings. @@ -104,6 +106,9 @@ interface VoiceInteractionController { // 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); + // Return if the voice interaction setting is enabled/disabled. IsSettingEnabled() => (bool enabled); diff --git a/chromium/ash/public/interfaces/web_contents_manager.mojom b/chromium/ash/public/interfaces/web_contents_manager.mojom index 02f6c1fd167..65037d9ab51 100644 --- a/chromium/ash/public/interfaces/web_contents_manager.mojom +++ b/chromium/ash/public/interfaces/web_contents_manager.mojom @@ -6,6 +6,7 @@ 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"; @@ -58,7 +59,9 @@ struct ManagedWebContentsParams { // 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|. Return false - // to consume the navigation attempt or true to allow it to continue. - ShouldOpenUrlFromTab(url.mojom.Url url) => (bool should_open); + // 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/public/interfaces/window_actions.mojom b/chromium/ash/public/interfaces/window_actions.mojom deleted file mode 100644 index 1caa15b71b9..00000000000 --- a/chromium/ash/public/interfaces/window_actions.mojom +++ /dev/null @@ -1,10 +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 multiprofile mode in chromeos performs tricks with window visibility -// which require manually notifying the tablet mode controller that a window -// should be considered visible. -const string kAddWindowToTabletMode = "ash:add-window-to-tablet-mode"; diff --git a/chromium/ash/public/interfaces/window_properties.mojom b/chromium/ash/public/interfaces/window_properties.mojom index 839d8765525..ca01ba6296d 100644 --- a/chromium/ash/public/interfaces/window_properties.mojom +++ b/chromium/ash/public/interfaces/window_properties.mojom @@ -18,43 +18,22 @@ const string kBlockedForAssistantSnapshot_Property = const string kCanConsumeSystemKeys_Property = "ash:can-consume-system-keys"; -// The bounds of the window control buttons (minimize, maximize, restore) -// relative to the frame. -const string kCaptionButtonBounds_Property = "ash:caption-button-bounds"; - -// An UnguessableToken used to tell Mash the frame image to use for a custom -// Browser theme, for both a window's active state and its inactive state. -// The token to image mapping is stored in ash::ClientImageRegistry. -const string kFrameImageActive_Property = "ash:frame-image-active"; -const string kFrameImageInactive_Property = "ash:frame-image-inactive"; - -// More frame image tokens. These map to "theme_frame_overlay[_inactive]" in -// custom browser themes. See browser_theme_pack.cc -const string kFrameImageOverlayActive_Property = - "ash:frame-image-overlay-active"; -const string kFrameImageOverlayInactive_Property = - "ash:frame-image-overlay-inactive"; - -// A property that controls where a themed window's image is painted. -const string kFrameImageYInset_Property = "ash:frame-image-y-inset"; - -// A boolean that tells Ash whether the frame's colors come from a PWA manifest. -const string kFrameIsThemedByHostedApp_Property = - "ash:frame-is-themed-by-hosted-app"; - -// The color of the text drawn on the frame (i.e. the window title). Only used -// for tabless browser windows. -const string kFrameTextColor_Property = "ash:frame-text-color"; - -// See ash::kHideCaptionButtonsInTabletModeKey. -const string kHideCaptionButtonsInTabletMode_Property = - "ash:hide-caption-buttons-in-tablet-mode"; - // 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 @@ -69,6 +48,15 @@ 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"; + +// A property key to store the window state type when the tab-dragging finishes. +const string kTabDroppedWindowStateType_Property = + "ash:tab-dropped-window-state-type"; + // 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. @@ -87,3 +75,7 @@ const string kRestoreBoundsOverride_Property = // 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"; diff --git a/chromium/ash/public/interfaces/window_style.mojom b/chromium/ash/public/interfaces/window_style.mojom deleted file mode 100644 index 819e232cb1f..00000000000 --- a/chromium/ash/public/interfaces/window_style.mojom +++ /dev/null @@ -1,13 +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; - -// Used to specify how the frame decorations and style should look. -enum WindowStyle { - DEFAULT = 0, - BROWSER, -}; - -const string kAshWindowStyle_InitProperty = "ash:window-style"; diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 2ce0c939719..82fed09a6b8 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -29,6 +29,7 @@ aggregate_vector_icons("ash_vector_icons") { "lock_screen_caps_lock.icon", "lock_screen_dropdown.icon", "lock_screen_fingerprint.icon", + "lock_screen_fingerprint_success.icon", "lock_screen_time_limit_alarm.icon", "login_screen_button_dropdown.icon", "login_screen_menu_dropdown.icon", @@ -80,6 +81,7 @@ aggregate_vector_icons("ash_vector_icons") { "notification_timer.icon", "overview_text_filter_search.icon", "overview_window_close.icon", + "overview_drop_target_plus.icon", "palette_action_capture_region.icon", "palette_action_capture_screen.icon", "palette_action_create_note.icon", @@ -93,6 +95,7 @@ aggregate_vector_icons("ash_vector_icons") { "palette_tray_icon_magnify.icon", "palette_tray_icon_metalayer.icon", "send.icon", + "settings.icon", "shelf_add_person_button.icon", "shelf_apps_button.icon", "shelf_back.icon", @@ -234,10 +237,6 @@ aggregate_vector_icons("ash_vector_icons") { "unified_network_badge_secure.icon", "unified_network_badge_vpn.icon", "wallpaper.icon", - "window_control_back.icon", - "window_control_dezoom.icon", - "window_control_menu.icon", - "window_control_zoom.icon", ] if (is_chrome_branded) { diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn index adf6aff763b..ea3e60d0b4d 100644 --- a/chromium/ash/strings/BUILD.gn +++ b/chromium/ash/strings/BUILD.gn @@ -81,6 +81,7 @@ template("repack_one_locale_ash") { sources = [ "$root_gen_dir/ash/components/strings/ash_components_strings_${locale}.pak", "$root_gen_dir/ash/strings/ash_strings_${locale}.pak", + "$root_gen_dir/chromeos/strings/chromeos_strings_${locale}.pak", "$root_gen_dir/components/strings/components_strings_${locale}.pak", "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_${locale}.pak", "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak", @@ -91,6 +92,7 @@ template("repack_one_locale_ash") { deps = [ "//ash/components/strings", "//ash/strings", + "//chromeos/strings", "//components/strings", "//device/bluetooth/strings", "//ui/chromeos/strings", diff --git a/chromium/ash/system/message_center/arc/BUILD.gn b/chromium/ash/system/message_center/arc/BUILD.gn index c057291d19c..b3e4846abaa 100644 --- a/chromium/ash/system/message_center/arc/BUILD.gn +++ b/chromium/ash/system/message_center/arc/BUILD.gn @@ -32,6 +32,7 @@ static_library("arc") { deps = [ "//base", "//components/account_id", + "//components/arc:arc_metrics_constants", "//components/arc:connection_holder", "//components/arc/common:notifications", "//components/exo", -- cgit v1.2.1