diff options
Diffstat (limited to 'chromium/ash/public/mojom')
7 files changed, 44 insertions, 73 deletions
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); -}; |