diff options
Diffstat (limited to 'chromium/ash')
| -rw-r--r-- | chromium/ash/BUILD.gn | 51 | ||||
| -rw-r--r-- | chromium/ash/app_list/BUILD.gn | 15 | ||||
| -rw-r--r-- | chromium/ash/app_list/presenter/BUILD.gn | 35 | ||||
| -rw-r--r-- | chromium/ash/assistant/ui/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/ash/components/resources/BUILD.gn | 16 | ||||
| -rw-r--r-- | chromium/ash/public/cpp/BUILD.gn | 7 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/assistant_controller.mojom | 6 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/assistant_state_controller.mojom | 42 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/assistant_volume_control.mojom | 2 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/cros_display_config.mojom | 2 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/ime_controller.mojom | 2 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/tray_action.mojom | 3 | ||||
| -rw-r--r-- | chromium/ash/public/mojom/voice_interaction_controller.mojom | 60 | ||||
| -rw-r--r-- | chromium/ash/resources/BUILD.gn | 6 | ||||
| -rw-r--r-- | chromium/ash/resources/vector_icons/BUILD.gn | 7 |
15 files changed, 107 insertions, 151 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index da791573c1a..10d8dfbd1f2 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -57,10 +57,13 @@ component("ash") { "public/cpp/multi_user_window_manager_delegate.h", "public/cpp/multi_user_window_manager_observer.h", "public/cpp/overview_test_api.h", + "public/cpp/shelf_config.h", "public/cpp/split_view_test_api.h", "public/cpp/window_finder.h", "public/cpp/window_tree_host_lookup.h", "root_window_controller.h", + "rotator/screen_rotation_animator.h", + "rotator/screen_rotation_animator_observer.h", "screenshot_delegate.h", "session/session_controller_impl.h", "shelf/shelf.h", @@ -176,7 +179,6 @@ component("ash") { "ambient/util/ambient_util.h", "animation/animation_change_type.h", "app_list/app_list_controller_impl.cc", - "app_list/app_list_controller_observer.h", "app_list/app_list_presenter_delegate_impl.cc", "app_list/app_list_presenter_delegate_impl.h", "ash_export.h", @@ -334,6 +336,8 @@ component("ash") { "highlighter/highlighter_result_view.h", "highlighter/highlighter_view.cc", "highlighter/highlighter_view.h", + "home_screen/drag_window_from_shelf_controller.cc", + "home_screen/drag_window_from_shelf_controller.h", "home_screen/home_launcher_gesture_handler.cc", "home_screen/home_launcher_gesture_handler.h", "home_screen/home_launcher_gesture_handler_observer.h", @@ -342,6 +346,8 @@ component("ash") { "home_screen/home_screen_delegate.h", "home_screen/home_screen_presenter.cc", "home_screen/home_screen_presenter.h", + "home_screen/swipe_home_to_overview_controller.cc", + "home_screen/swipe_home_to_overview_controller.h", "host/ash_window_tree_host.cc", "host/ash_window_tree_host.h", "host/ash_window_tree_host_init_params.h", @@ -587,7 +593,7 @@ component("ash") { "shelf/shelf_button_delegate.h", "shelf/shelf_button_pressed_metric_tracker.cc", "shelf/shelf_button_pressed_metric_tracker.h", - "shelf/shelf_constants.h", + "shelf/shelf_config.cc", "shelf/shelf_container_view.cc", "shelf/shelf_container_view.h", "shelf/shelf_context_menu_model.cc", @@ -610,6 +616,7 @@ component("ash") { "shelf/shelf_observer.h", "shelf/shelf_tooltip_bubble.cc", "shelf/shelf_tooltip_bubble.h", + "shelf/shelf_tooltip_delegate.h", "shelf/shelf_tooltip_manager.cc", "shelf/shelf_tooltip_manager.h", "shelf/shelf_tooltip_preview_bubble.cc", @@ -732,8 +739,8 @@ component("ash") { "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/ash_message_popup_collection.cc", + "system/message_center/ash_message_popup_collection.h", "system/message_center/fullscreen_notification_blocker.cc", "system/message_center/fullscreen_notification_blocker.h", "system/message_center/inactive_user_notification_blocker.cc", @@ -752,6 +759,8 @@ component("ash") { "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/stacked_notification_bar.cc", + "system/message_center/stacked_notification_bar.h", "system/message_center/unified_message_center_bubble.cc", "system/message_center/unified_message_center_bubble.h", "system/message_center/unified_message_center_view.cc", @@ -936,6 +945,8 @@ component("ash") { "system/tray/interacted_by_tap_recorder.h", "system/tray/size_range_layout.cc", "system/tray/size_range_layout.h", + "system/tray/status_area_overflow_button_tray.cc", + "system/tray/status_area_overflow_button_tray.h", "system/tray/system_menu_button.cc", "system/tray/system_menu_button.h", "system/tray/system_tray_item_uma_type.h", @@ -1080,6 +1091,8 @@ component("ash") { "wm/always_on_top_controller.h", "wm/ash_focus_rules.cc", "wm/ash_focus_rules.h", + "wm/back_gesture_affordance.cc", + "wm/back_gesture_affordance.h", "wm/base_state.cc", "wm/base_state.h", "wm/client_controlled_state.cc", @@ -1176,6 +1189,8 @@ component("ash") { "wm/overview/overview_test_api.cc", "wm/overview/overview_utils.cc", "wm/overview/overview_utils.h", + "wm/overview/overview_wallpaper_controller.cc", + "wm/overview/overview_wallpaper_controller.h", "wm/overview/overview_window_drag_controller.cc", "wm/overview/overview_window_drag_controller.h", "wm/overview/rounded_label_widget.cc", @@ -1216,6 +1231,7 @@ component("ash") { "wm/splitview/split_view_drag_indicators.h", "wm/splitview/split_view_highlight_view.cc", "wm/splitview/split_view_highlight_view.h", + "wm/splitview/split_view_observer.h", "wm/splitview/split_view_test_api.cc", "wm/splitview/split_view_utils.cc", "wm/splitview/split_view_utils.h", @@ -1319,6 +1335,7 @@ component("ash") { "//ash/strings", "//ash/wayland", "//components/discardable_memory/public/mojom", + "//mojo/public/cpp/bindings", "//mojo/public/cpp/system", "//services/device/public/cpp/bluetooth", "//services/device/public/mojom", @@ -1337,7 +1354,7 @@ component("ash") { "//ui/wm", ] deps = [ - "//ash/app_list/presenter", + "//ash/app_list", "//ash/app_menu", "//ash/assistant/model", "//ash/assistant/ui", @@ -1519,7 +1536,7 @@ static_library("ash_shell_lib") { deps = [ ":ash", ":test_support", - "//ash/app_list/presenter", + "//ash/app_list", "//ash/public/cpp", "//base", "//base:i18n", @@ -1639,14 +1656,15 @@ test("ash_unittests") { "app_list/app_list_controller_impl_unittest.cc", "app_list/app_list_metrics_unittest.cc", "app_list/app_list_presenter_delegate_unittest.cc", + "app_list/app_list_presenter_impl_unittest.cc", "app_list/app_list_unittest.cc", "app_list/model/app_list_item_list_unittest.cc", "app_list/model/app_list_model_unittest.cc", - "app_list/presenter/app_list_presenter_impl_unittest.cc", "app_list/views/assistant/assistant_page_view_unittest.cc", "app_menu/notification_menu_controller_unittest.cc", "app_menu/notification_menu_view_unittest.cc", "app_menu/notification_overflow_view_unittest.cc", + "assistant/assistant_alarm_timer_controller_unittest.cc", "assistant/assistant_notification_controller_unittest.cc", "assistant/assistant_screen_context_controller_unittest.cc", "assistant/assistant_state_controller_unittest.cc", @@ -1769,13 +1787,17 @@ test("ash_unittests") { "shelf/back_button_unittest.cc", "shelf/home_button_unittest.cc", "shelf/login_shelf_view_unittest.cc", + "shelf/scrollable_shelf_view_unittest.cc", "shelf/shelf_application_menu_model_unittest.cc", "shelf/shelf_background_animator_unittest.cc", "shelf/shelf_button_pressed_metric_tracker_unittest.cc", + "shelf/shelf_config_unittest.cc", "shelf/shelf_context_menu_model_unittest.cc", "shelf/shelf_controller_unittest.cc", "shelf/shelf_layout_manager_unittest.cc", "shelf/shelf_locking_manager_unittest.cc", + "shelf/shelf_test_util.cc", + "shelf/shelf_test_util.h", "shelf/shelf_tooltip_manager_unittest.cc", "shelf/shelf_unittest.cc", "shelf/shelf_view_unittest.cc", @@ -1800,7 +1822,7 @@ test("ash_unittests") { "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/ash_message_popup_collection_unittest.cc", "system/message_center/inactive_user_notification_blocker_unittest.cc", "system/message_center/message_center_ui_controller_unittest.cc", "system/message_center/notifier_settings_view_unittest.cc", @@ -1846,6 +1868,7 @@ test("ash_unittests") { "system/toast/toast_manager_unittest.cc", "system/tracing_notification_controller_unittest.cc", "system/tray/size_range_layout_unittest.cc", + "system/tray/status_area_overflow_button_tray_unittest.cc", "system/tray/tray_event_filter_unittest.cc", "system/tray/tray_info_label_unittest.cc", "system/tray/tri_view_unittest.cc", @@ -1876,12 +1899,11 @@ test("ash_unittests") { "window_user_data_unittest.cc", "wm/always_on_top_controller_unittest.cc", "wm/ash_focus_rules_unittest.cc", + "wm/back_gesture_affordance_unittest.cc", "wm/client_controlled_state_unittest.cc", "wm/collision_detection/collision_detection_utils_unittest.cc", "wm/container_finder_unittest.cc", "wm/default_window_resizer_unittest.cc", - "wm/desks/desks_test_util.cc", - "wm/desks/desks_test_util.h", "wm/desks/desks_unittests.cc", "wm/drag_window_resizer_unittest.cc", "wm/fullscreen_window_finder_unittest.cc", @@ -1952,8 +1974,8 @@ test("ash_unittests") { deps = [ ":ash", ":test_support", + "//ash/app_list", "//ash/app_list:test_support", - "//ash/app_list/presenter", "//ash/app_menu", "//ash/assistant/model", "//ash/assistant/ui", @@ -2014,6 +2036,7 @@ test("ash_unittests") { "//device/bluetooth:mocks", "//extensions/common:common_constants", "//mojo/core/embedder", + "//mojo/public/cpp/bindings", "//net:net", "//services/device/public/cpp/bluetooth", "//services/media_session/public/cpp/test:test_support", @@ -2261,8 +2284,12 @@ static_library("test_support") { "wallpaper/wallpaper_controller_test_api.h", "wm/cursor_manager_test_api.cc", "wm/cursor_manager_test_api.h", + "wm/desks/desks_test_util.cc", + "wm/desks/desks_test_util.h", "wm/lock_state_controller_test_api.cc", "wm/lock_state_controller_test_api.h", + "wm/splitview/multi_display_overview_and_split_view_test.cc", + "wm/splitview/multi_display_overview_and_split_view_test.h", "wm/splitview/split_view_highlight_view_test_api.cc", "wm/splitview/split_view_highlight_view_test_api.h", "wm/tablet_mode/tablet_mode_controller_test_api.cc", @@ -2296,8 +2323,8 @@ static_library("test_support") { ] deps = [ "//ash", + "//ash/app_list", "//ash/app_list:test_support", - "//ash/app_list/presenter", "//ash/app_menu", "//ash/assistant/model:model", "//ash/components/fast_ink", diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn index 9fc51e66993..d3a924bdac7 100644 --- a/chromium/ash/app_list/BUILD.gn +++ b/chromium/ash/app_list/BUILD.gn @@ -12,6 +12,9 @@ component("app_list") { "app_list_export.h", "app_list_metrics.cc", "app_list_metrics.h", + "app_list_presenter_delegate.h", + "app_list_presenter_impl.cc", + "app_list_presenter_impl.h", "app_list_util.cc", "app_list_util.h", "app_list_view_delegate.h", @@ -35,14 +38,14 @@ component("app_list") { "views/apps_grid_view.cc", "views/apps_grid_view.h", "views/apps_grid_view_folder_delegate.h", + "views/assistant/assistant_dialog_plate.cc", + "views/assistant/assistant_dialog_plate.h", "views/assistant/assistant_main_stage.cc", "views/assistant/assistant_main_stage.h", "views/assistant/assistant_main_view.cc", "views/assistant/assistant_main_view.h", "views/assistant/assistant_page_view.cc", "views/assistant/assistant_page_view.h", - "views/assistant/dialog_plate.cc", - "views/assistant/dialog_plate.h", "views/assistant/privacy_info_view.cc", "views/assistant/privacy_info_view.h", "views/contents_view.cc", @@ -145,7 +148,15 @@ component("app_list") { "//ash/app_list/model:app_list_model", "//ash/app_list/model:search_model", "//ash/public/cpp", + "//base", + "//mojo/public/cpp/bindings", "//services/content/public/mojom", + "//ui/aura", + "//ui/compositor", + "//ui/gfx/geometry", + "//ui/views", + "//ui/wm", + "//ui/wm/public", ] } diff --git a/chromium/ash/app_list/presenter/BUILD.gn b/chromium/ash/app_list/presenter/BUILD.gn deleted file mode 100644 index 8d1a3b46e87..00000000000 --- a/chromium/ash/app_list/presenter/BUILD.gn +++ /dev/null @@ -1,35 +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") -import("//testing/test.gni") - -assert(use_aura) - -component("presenter") { - sources = [ - "app_list_presenter_delegate.h", - "app_list_presenter_export.h", - "app_list_presenter_impl.cc", - "app_list_presenter_impl.h", - ] - - defines = [ "APP_LIST_PRESENTER_IMPLEMENTATION" ] - - public_deps = [ - "//ash/app_list", - "//base", - "//mojo/public/cpp/bindings", - "//ui/aura", - "//ui/compositor", - "//ui/gfx/geometry", - "//ui/views", - "//ui/wm", - "//ui/wm/public", - - # Temporary dependency to fix compile flake in http://crbug.com/611898. - # TODO(tapted): Remove once http://crbug.com/612382 is fixed. - "//ui/accessibility:ax_enums_mojo", - ] -} diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn index 0ac76631a0f..88ef2fb65ef 100644 --- a/chromium/ash/assistant/ui/BUILD.gn +++ b/chromium/ash/assistant/ui/BUILD.gn @@ -66,6 +66,8 @@ component("ui") { "dialog_plate/mic_view.h", "logo_view/logo_view.cc", "logo_view/logo_view.h", + "main_stage/animated_container_view.cc", + "main_stage/animated_container_view.h", "main_stage/assistant_card_element_view.cc", "main_stage/assistant_card_element_view.h", "main_stage/assistant_footer_view.cc", @@ -82,6 +84,8 @@ component("ui") { "main_stage/assistant_query_view.h", "main_stage/assistant_text_element_view.cc", "main_stage/assistant_text_element_view.h", + "main_stage/element_animator.cc", + "main_stage/element_animator.h", "main_stage/suggestion_chip_view.cc", "main_stage/suggestion_chip_view.h", "main_stage/suggestion_container_view.cc", diff --git a/chromium/ash/components/resources/BUILD.gn b/chromium/ash/components/resources/BUILD.gn deleted file mode 100644 index 4d3fc291495..00000000000 --- a/chromium/ash/components/resources/BUILD.gn +++ /dev/null @@ -1,16 +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. - -import("//tools/grit/grit_rule.gni") - -grit("resources") { - source = "ash_components_resources.grd" - outputs = [ - "grit/ash_components_resources.h", - "grit/ash_components_resources_map.cc", - "grit/ash_components_resources_map.h", - "ash_components_resources_100_percent.pak", - "ash_components_resources_200_percent.pak", - ] -} diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index c4138ad670c..69a3202d893 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -28,6 +28,7 @@ component("cpp") { "app_list/app_list_config_provider.h", "app_list/app_list_controller.cc", "app_list/app_list_controller.h", + "app_list/app_list_controller_observer.h", "app_list/app_list_features.cc", "app_list/app_list_features.h", "app_list/app_list_metrics.cc", @@ -94,6 +95,8 @@ component("cpp") { "default_frame_header.h", "default_scale_factor_retriever.cc", "default_scale_factor_retriever.h", + "desks_helper.cc", + "desks_helper.h", "fps_counter.cc", "fps_counter.h", "frame_header.cc", @@ -191,8 +194,6 @@ component("cpp") { "shell_window_ids.h", "shutdown_controller.cc", "shutdown_controller.h", - "split_view.cc", - "split_view.h", "spoken_feedback_event_rewriter_delegate.h", "stylus_utils.cc", "stylus_utils.h", @@ -309,6 +310,7 @@ source_set("manifest_for_tests") { source_set("unit_tests") { testonly = true sources = [ + "android_intent_helper_unittest.cc", "app_list/app_list_config_provider_unittest.cc", "default_scale_factor_retriever_unittest.cc", "pagination/pagination_model_unittest.cc", @@ -322,6 +324,7 @@ source_set("unit_tests") { ":cpp", "//base", "//base/test:test_support", + "//mojo/public/cpp/bindings", "//testing/gtest", "//ui/aura:test_support", "//ui/compositor_extra", diff --git a/chromium/ash/public/mojom/assistant_controller.mojom b/chromium/ash/public/mojom/assistant_controller.mojom index bb7e017860d..124154e37bf 100644 --- a/chromium/ash/public/mojom/assistant_controller.mojom +++ b/chromium/ash/public/mojom/assistant_controller.mojom @@ -53,12 +53,6 @@ struct AssistantAlarmTimerEvent { // AssistantController. Currently used by the Assistant service to notify Ash // of changes to the underlying alarm/timer state in LibAssistant. interface AssistantAlarmTimerController { - // Invoked when a timer has started sounding. - OnTimerSoundingStarted(); - - // Invoked when a timer has finished sounding. - OnTimerSoundingFinished(); - // Invoked when an alarm/timer state changed. No alarm/timer is ringing if // |event| is nullptr. OnAlarmTimerStateChanged(AssistantAlarmTimerEvent? event); diff --git a/chromium/ash/public/mojom/assistant_state_controller.mojom b/chromium/ash/public/mojom/assistant_state_controller.mojom index 42b924f074b..34538e4ca32 100644 --- a/chromium/ash/public/mojom/assistant_state_controller.mojom +++ b/chromium/ash/public/mojom/assistant_state_controller.mojom @@ -4,12 +4,48 @@ module ash.mojom; -import "ash/public/mojom/voice_interaction_controller.mojom"; +// The initial state is NOT_READY, after Assistant service started it becomes +// READY. When Assistant UI shows up the state becomes VISIBLE. +enum AssistantState { + // The Assistant service is not ready yet. + NOT_READY = 0, + // The Assistant service is ready. + READY, + // The Assistant service is ready. + // TODO(b/142428671): This is set when the Assistant backend signals it is + // ready to handle queries, where |READY| is signaled when it is started. + // If this signal turns out to be reliable it should replace |READY| and be + // renamed to |READY|. + NEW_READY, +}; + +enum AssistantAllowedState { + // Assistant feature is allowed. + ALLOWED = 0, + // Disallowed because search and assistant is disabled by policy. + DISALLOWED_BY_POLICY, + // Disallowed because user's locale is not compatible. + DISALLOWED_BY_LOCALE, + // Disallowed because current user is not primary user. + DISALLOWED_BY_NONPRIMARY_USER, + // Disallowed because current user is supervised user. + DISALLOWED_BY_SUPERVISED_USER, + // Disallowed because incognito mode. + DISALLOWED_BY_INCOGNITO, + // Disallowed because the device is in demo mode. + DISALLOWED_BY_DEMO_MODE, + // Disallowed because the device is in public session. + DISALLOWED_BY_PUBLIC_SESSION, + // Disallowed because the user's account type is currently not supported. + DISALLOWED_BY_ACCOUNT_TYPE, + // Disallowed because the device is in Kiosk mode. + DISALLOWED_BY_KIOSK_MODE +}; // Allows observing changes to Assistant status and settings. interface AssistantStateObserver { // Called when Assistant state changes. - OnAssistantStatusChanged(VoiceInteractionState state); + OnAssistantStatusChanged(AssistantState state); // Called when assistant feature allowed state has changed. OnAssistantFeatureAllowedChanged(AssistantAllowedState state); @@ -30,5 +66,5 @@ interface AssistantStateObserver { // which notifies changes of Assistant status and settings. interface AssistantStateController { // Add an observer. - AddMojomObserver(AssistantStateObserver observer); + AddMojomObserver(pending_remote<AssistantStateObserver> observer); }; diff --git a/chromium/ash/public/mojom/assistant_volume_control.mojom b/chromium/ash/public/mojom/assistant_volume_control.mojom index e8bf405d627..a3660bec04a 100644 --- a/chromium/ash/public/mojom/assistant_volume_control.mojom +++ b/chromium/ash/public/mojom/assistant_volume_control.mojom @@ -14,7 +14,7 @@ interface AssistantVolumeControl { // Adds volume observer. The observer will be immediately notified of volume // and mute status when added. - AddVolumeObserver(VolumeObserver observer); + AddVolumeObserver(pending_remote<VolumeObserver> observer); }; // Observes volume state changes. diff --git a/chromium/ash/public/mojom/cros_display_config.mojom b/chromium/ash/public/mojom/cros_display_config.mojom index 774f0533c0d..a3b30049d4c 100644 --- a/chromium/ash/public/mojom/cros_display_config.mojom +++ b/chromium/ash/public/mojom/cros_display_config.mojom @@ -231,7 +231,7 @@ struct DisplayConfigProperties { interface CrosDisplayConfigController { // Observers are notified when the display layout or any display properties // change. - AddObserver(associated CrosDisplayConfigObserver observer); + AddObserver(pending_associated_remote<CrosDisplayConfigObserver> observer); // Returns the display layout info, including the list of layouts. GetDisplayLayoutInfo() => (DisplayLayoutInfo info); diff --git a/chromium/ash/public/mojom/ime_controller.mojom b/chromium/ash/public/mojom/ime_controller.mojom index 9edb3a69b12..ad682e57328 100644 --- a/chromium/ash/public/mojom/ime_controller.mojom +++ b/chromium/ash/public/mojom/ime_controller.mojom @@ -12,7 +12,7 @@ import "ui/gfx/geometry/mojom/geometry.mojom"; // Interface for ash client (e.g. Chrome) to send input method info to ash. interface ImeController { // Sets the client interface. - SetClient(ImeControllerClient client); + SetClient(pending_remote<ImeControllerClient> client); // Updates the cached IME information and refreshes the IME menus. // |current_ime_id| is empty when there is no active IME yet. diff --git a/chromium/ash/public/mojom/tray_action.mojom b/chromium/ash/public/mojom/tray_action.mojom index e366f9a1ec2..4c951576fd3 100644 --- a/chromium/ash/public/mojom/tray_action.mojom +++ b/chromium/ash/public/mojom/tray_action.mojom @@ -84,7 +84,8 @@ interface TrayAction { // Sets the client to be used to handle action requests. // |lock_screen_note_state|: The current lock screen note action state // associated with the client. - SetClient(TrayActionClient client, TrayActionState lock_screen_note_state); + SetClient(pending_remote<TrayActionClient> client, + TrayActionState lock_screen_note_state); // Updates action state for the lock screen note action. If called with no // client set, the state change will not take effect until a client is set. diff --git a/chromium/ash/public/mojom/voice_interaction_controller.mojom b/chromium/ash/public/mojom/voice_interaction_controller.mojom index 8f19c8ebf85..64b3fc49889 100644 --- a/chromium/ash/public/mojom/voice_interaction_controller.mojom +++ b/chromium/ash/public/mojom/voice_interaction_controller.mojom @@ -21,63 +21,3 @@ enum VoiceInteractionState { // Voice interaction session is currently running. RUNNING }; - -enum AssistantAllowedState { - // Assistant feature is allowed. - ALLOWED = 0, - // Disallowed because search and assistant is disabled by policy. - DISALLOWED_BY_POLICY, - // Disallowed because user's locale is not compatible. - DISALLOWED_BY_LOCALE, - // Disallowed because current user is not primary user. - DISALLOWED_BY_NONPRIMARY_USER, - // Disallowed because current user is supervised user. - DISALLOWED_BY_SUPERVISED_USER, - // Disallowed because incognito mode. - DISALLOWED_BY_INCOGNITO, - // Disallowed because the device is in demo mode. - DISALLOWED_BY_DEMO_MODE, - // Disallowed because the device is in public session. - DISALLOWED_BY_PUBLIC_SESSION, - // Disallowed because the user's account type is currently not supported. - DISALLOWED_BY_ACCOUNT_TYPE, - // Disallowed because the device is in Kiosk mode. - DISALLOWED_BY_KIOSK_MODE -}; - -// Allows observing changes to voice interaction status and settings. -interface VoiceInteractionObserver { - // Called when voice interaction session state changes. - OnVoiceInteractionStatusChanged(VoiceInteractionState state); - - // Called when voice interaction is enabled/disabled in settings. - OnVoiceInteractionSettingsEnabled(bool enabled); - - // Called when voice interaction service is allowed/disallowed to access - // the "context" (text and graphic content that is currently on screen). - OnVoiceInteractionContextEnabled(bool enabled); - - // Called when hotword listening is enabled/disabled. - OnVoiceInteractionHotwordEnabled(bool enabled); - - // Called when assistant feature allowed state has changed. - OnAssistantFeatureAllowedChanged(AssistantAllowedState state); - - // Called when Google Play Store is enabled/disabled. - OnArcPlayStoreEnabledChanged(bool enabled); - - // Called when locale is changed in pref. The locale is in the format can be - // "en-US" or simply "en". When locale is not set in pref, it returns empty - // string. - OnLocaleChanged(string locale); - - // Called when locked full screen state has changed. - OnLockedFullScreenStateChanged(bool enabled); -}; - -// Interface for ash client (Chrome) to connect to the voice interaction -// controller, which notifies changes of voice interaction related flags. -interface VoiceInteractionController { - // Add an observer. - AddObserver(VoiceInteractionObserver observer); -}; diff --git a/chromium/ash/resources/BUILD.gn b/chromium/ash/resources/BUILD.gn index 7e6acf459c5..898b7a78952 100644 --- a/chromium/ash/resources/BUILD.gn +++ b/chromium/ash/resources/BUILD.gn @@ -19,7 +19,6 @@ template("ash_test_resources") { sources = [ "$root_gen_dir/ash/app_list/resources/app_list_resources_${percent}_percent.pak", - "$root_gen_dir/ash/components/resources/ash_components_resources_${percent}_percent.pak", "$root_gen_dir/ash/login/resources/login_resources_${percent}_percent.pak", "$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak", "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak", @@ -40,7 +39,6 @@ template("ash_test_resources") { deps = [ "//ash/app_list/resources", - "//ash/components/resources", "//ash/login/resources", "//ash/public/cpp/resources:ash_public_unscaled_resources", "//mojo/public/js:resources", @@ -76,13 +74,13 @@ ash_test_resources("200_percent") { ash_test_resources("with_content_100_percent") { percent = "100" sources = [ - "$root_gen_dir/content/app/strings/content_strings_en-US.pak", "$root_gen_dir/content/content_resources.pak", "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak", + "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak", ] deps = [ "//content:resources", - "//content/app/strings", "//third_party/blink/public:scaled_resources_100_percent", + "//third_party/blink/public/strings", ] } diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 0557e772dab..8a9f0d73cec 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -11,7 +11,6 @@ aggregate_vector_icons("ash_vector_icons") { icons = [ "always_show_shelf.icon", "assistant.icon", - "assistant_mic.icon", "auto_hide.icon", "autoclick.icon", "autoclick_close.icon", @@ -121,12 +120,6 @@ aggregate_vector_icons("ash_vector_icons") { "palette_tray_icon_magnify.icon", "palette_tray_icon_metalayer.icon", "parent_access_lock.icon", - "lock_screen_pause.icon", - "lock_screen_play.icon", - "lock_screen_previous_track.icon", - "lock_screen_next_track.icon", - "lock_screen_seek_forward.icon", - "lock_screen_seek_backward.icon", "send.icon", "settings.icon", "shelf_add_person_button.icon", |