BASELINE: Update Chromium to 75.0.3770.56

Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

19 files changed, 234 insertions, 59 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 9298d7ac062..5bfea816bc3 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -120,8 +120,6 @@ component("cpp") {
     "touch_uma.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",
@@ -133,7 +131,7 @@ component("cpp") {
   deps = [
     "//ash/public/cpp/vector_icons",
     "//chromeos/constants",
-    "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus/power:power_manager_proto",
     "//components/prefs",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
@@ -234,6 +232,7 @@ source_set("unit_tests") {
     ":cpp",
     ":test_interfaces",
     "//base",
+    "//base/test:test_support",
     "//testing/gtest",
     "//ui/aura:test_support",
     "//ui/gfx:test_support",
diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn
index 350c537fcf6..f4c69a9d2a6 100644
--- a/chromium/ash/public/cpp/vector_icons/BUILD.gn
+++ b/chromium/ash/public/cpp/vector_icons/BUILD.gn
@@ -11,7 +11,6 @@ aggregate_vector_icons("ash_public_vector_icons") {
   icons = [
     "assistant.icon",
     "assistant_mic.icon",
-    "auto_launch_managed_guest_session.icon",
     "notification_assistant.icon",
     "notification_captive_portal.icon",
     "notification_cellular_alert.icon",
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 875defeb4aa..9ed96148ed9 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -9,7 +9,10 @@ import("//mojo/public/tools/bindings/mojom.gni")
 # and //ash/public/cpp needs to depend on this for generated code (such as
 # enums and constants).
 mojom("interfaces_internal") {
-  visibility = [ "//ash/public/cpp:*" ]
+  visibility = [
+    "//ash/public/cpp:*",
+    "//ash/public/interfaces:test_interfaces",
+  ]
   disable_variants = true
 
   sources = [
@@ -18,6 +21,7 @@ mojom("interfaces_internal") {
     "accessibility_controller_enums.mojom",
     "accessibility_focus_ring_controller.mojom",
     "app_list.mojom",
+    "app_list_view.mojom",
     "arc_custom_tab.mojom",
     "ash_display_controller.mojom",
     "ash_message_center_controller.mojom",
@@ -110,6 +114,7 @@ mojom("test_interfaces") {
     "time_to_first_present_recorder_test_api.test-mojom",
   ]
   deps = [
+    "//ash/public/interfaces:interfaces_internal",
     "//components/account_id/interfaces",
     "//mojo/public/mojom/base",
     "//ui/gfx/geometry/mojo",
diff --git a/chromium/ash/public/interfaces/accessibility_controller.mojom b/chromium/ash/public/interfaces/accessibility_controller.mojom
index 6d8273edd4f..222ba803621 100644
--- a/chromium/ash/public/interfaces/accessibility_controller.mojom
+++ b/chromium/ash/public/interfaces/accessibility_controller.mojom
@@ -87,6 +87,9 @@ interface AccessibilityController {
   // Retrieves a string description of the current battery status.
   GetBatteryDescription()
     => (mojo_base.mojom.String16 battery_description);
+
+  // Shows or hides the virtual keyboard.
+  SetVirtualKeyboardVisible(bool is_visible);
 };
 
 // Interface for ash to request accessibility service from its client (e.g.
diff --git a/chromium/ash/public/interfaces/accessibility_controller_enums.mojom b/chromium/ash/public/interfaces/accessibility_controller_enums.mojom
index cd0e50273d3..6acf46af017 100644
--- a/chromium/ash/public/interfaces/accessibility_controller_enums.mojom
+++ b/chromium/ash/public/interfaces/accessibility_controller_enums.mojom
@@ -29,7 +29,14 @@ enum AccessibilityAlert {
   WINDOW_NEEDED,
 
   // When the user enters window overview mode.
-  WINDOW_OVERVIEW_MODE_ENTERED
+  WINDOW_OVERVIEW_MODE_ENTERED,
+
+  // When workspace state just changed to WORKSPACE_WINDOW_STATE_FULL_SCREEN.
+  WORKSPACE_FULLSCREEN_STATE_ENTERED,
+
+  // When workspace state just changed from WORKSPACE_WINDOW_STATE_FULL_SCREEN
+  // to others.
+  WORKSPACE_FULLSCREEN_STATE_EXITED
 };
 
 enum AccessibilityPanelState {
@@ -71,11 +78,10 @@ enum SelectToSpeakState {
   kSelectToSpeakStateSpeaking,
 };
 
-// The type of mouse event the dwell control feature should perform when
+// The type of mouse event the Automatic Clicks feature should perform when
 // dwelling. These values are written to prefs and correspond to
 // AutoclickActionType in enums.xml, so should not be changed. New values
 // should be added at the end.
-[Extensible]
 enum AutoclickEventType {
   // Perform a left click.
   kLeftClick,
@@ -95,3 +101,20 @@ enum AutoclickEventType {
 
   // TODO(katie): Add scroll.
 };
+
+// The Automatic Clicks feature's on-screen menu display location. These values
+// are written to prefs so they should not be changed. New values should be
+// added at the end.
+enum AutoclickMenuPosition {
+  // The bottom right of the screen.
+  kBottomRight,
+
+  // The bottom left of the screen.
+  kBottomLeft,
+
+  // The top left of the screen.
+  kTopLeft,
+
+  // The top right of the screen.
+  kTopRight,
+};
diff --git a/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom b/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom
index ae4ff29c744..91cf8e0b684 100644
--- a/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom
+++ b/chromium/ash/public/interfaces/accessibility_focus_ring_controller.mojom
@@ -8,24 +8,33 @@ import "ui/gfx/geometry/mojo/geometry.mojom";
 
 enum FocusRingBehavior { FADE_OUT_FOCUS_RING, PERSIST_FOCUS_RING };
 
+enum FocusRingType { GLOW, SOLID, DASHED };
+
+// Defines a specific focus ring by specifying:
+// - |rects_in_screen| the regions around which to draw the focus ring (in
+//       screen coordinates).
+// - |focus_ring_behavior| whether it should persist or fade.
+// - |focus_ring_type| the visual style of the focus ring.
+// - |color| the color of the focus ring.
+// - |secondary_color| a secondary color, used by some visual styles. The
+//       default value is SK_ColorTRANSPARENT.
+struct FocusRing {
+  array<gfx.mojom.Rect> rects_in_screen;
+  FocusRingBehavior behavior;
+  FocusRingType type;
+  uint32 color;
+  uint32 secondary_color = 0; // SK_ColorTRANSPARENT
+};
+
+
 // Interface for ash client (e.g. Chrome) to control and query accessibility
 // focus ring features.
 interface AccessibilityFocusRingController {
-  // Sets the focus ring color for the given caller.
-  SetFocusRingColor(uint32 skcolor, string caller_id);
-
-  // Resets the focus ring color back to the default for the given caller.
-  ResetFocusRingColor(string caller_id);
+  // Sets the focus ring with the given ID to the specifications of focus_ring.
+  SetFocusRing(string focus_ring_id, FocusRing focus_ring);
 
-  // Draws a focus ring around the given set of rects in screen coordinates. Use
-  // |focus_ring_behavior| to specify whether the focus ring should persist or
-  // fade out for the given caller.
-  SetFocusRing(array<gfx.mojom.Rect> rects_in_screen,
-               FocusRingBehavior focus_ring_behavior,
-               string caller_id);
-
-  // Hides focus ring on screen for the given caller.
-  HideFocusRing(string caller_id);
+  // Hides focus ring on screen with the given ID.
+  HideFocusRing(string focus_ring_id);
 
   // Draws a highlight at the given rects in screen coordinates. Rects may be
   // overlapping and will be merged into one layer. This looks similar to
@@ -38,10 +47,4 @@ interface AccessibilityFocusRingController {
   // Hides highlight on screen.
   // TODO(katie): Add |caller_id| to highlights as well.
   HideHighlights();
-
-  // Enables double focus rings and sets the second color for the given caller.
-  EnableDoubleFocusRing(uint32 skcolor, string caller_id);
-
-  // Disables double focus rings for the given caller.
-  DisableDoubleFocusRing(string caller_id);
 };
diff --git a/chromium/ash/public/interfaces/app_list.mojom b/chromium/ash/public/interfaces/app_list.mojom
index ce11378dfb7..45128e1a9b1 100644
--- a/chromium/ash/public/interfaces/app_list.mojom
+++ b/chromium/ash/public/interfaces/app_list.mojom
@@ -91,7 +91,7 @@ struct SearchResultMetadata {
 enum AppListState {
   kStateApps = 0,
   kStateSearchResults,
-  kStateStart,
+  kStateStart_DEPRECATED,
   kStateEmbeddedAssistant,
 };
 
@@ -103,11 +103,14 @@ enum AppListModelStatus {
 
 // The UI component the user launched the search result from. Must match
 // chrome/browser/ui/app_list/app_launch_event_logger.proto.
+// This enum is used in a histogram, do not remove/renumber entries. If you're
+// adding to this enum with the intention that it will be logged, update the
+// AppListLaunchedFrom enum listing in tools/metrics/histograms/enums.xml.
 enum AppListLaunchedFrom {
   kLaunchedFromGrid = 1,
-  kLaunchedFromSuggestionChip,
-  kLaunchedFromShelf,
-  kLaunchedFromSearchBox,
+  kLaunchedFromSuggestionChip = 2,
+  kLaunchedFromShelf = 3,
+  kLaunchedFromSearchBox = 4,
 };
 
 // The UI representation of the search result. Currently all search results
@@ -409,5 +412,6 @@ interface AppListClient {
   // Acquires a NavigableContentsFactory (indirectly) from the Content Service
   // to allow the app list to display embedded web contents. Currently used only
   // for answer card search results.
-  GetNavigableContentsFactory(content.mojom.NavigableContentsFactory& request);
+  GetNavigableContentsFactory(
+      pending_receiver<content.mojom.NavigableContentsFactory> receiver);
 };
diff --git a/chromium/ash/public/interfaces/app_list.typemap b/chromium/ash/public/interfaces/app_list.typemap
index 66f8326ea07..169a3c49700 100644
--- a/chromium/ash/public/interfaces/app_list.typemap
+++ b/chromium/ash/public/interfaces/app_list.typemap
@@ -8,9 +8,6 @@ traits_headers = [ "//ash/public/cpp/app_list/app_list_struct_traits.h" ]
 sources = [
   "//ash/public/cpp/app_list/app_list_struct_traits.cc",
 ]
-deps = [
-  "//ui/gfx/range/mojo:struct_traits",
-]
 type_mappings = [
   "ash.mojom.AppListState=ash::AppListState",
   "ash.mojom.AppListModelStatus=ash::AppListModelStatus",
diff --git a/chromium/ash/public/interfaces/app_list_view.mojom b/chromium/ash/public/interfaces/app_list_view.mojom
new file mode 100644
index 00000000000..e54a6bb558b
--- /dev/null
+++ b/chromium/ash/public/interfaces/app_list_view.mojom
@@ -0,0 +1,23 @@
+// 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;
+
+// All possible states of the app list view.
+enum AppListViewState {
+  // Closes |app_list_main_view_| and dismisses the delegate.
+  kClosed,
+  // The initial state for the app list when neither maximize or side shelf
+  // modes are active. If set, the widget will peek over the shelf by
+  // kPeekingAppListHeight DIPs.
+  kPeeking,
+  // Entered when text is entered into the search box from peeking mode.
+  kHalf,
+  // Default app list state in maximize and side shelf modes. Entered from an
+  // upward swipe from |PEEKING| or from clicking the chevron.
+  kFullscreenAllApps,
+  // Entered from an upward swipe from |HALF| or by entering text in the
+  // search box from |FULLSCREEN_ALL_APPS|.
+  kFullscreenSearch
+};
diff --git a/chromium/ash/public/interfaces/assistant_controller.mojom b/chromium/ash/public/interfaces/assistant_controller.mojom
index 75ec09c773f..a516771bcd0 100644
--- a/chromium/ash/public/interfaces/assistant_controller.mojom
+++ b/chromium/ash/public/interfaces/assistant_controller.mojom
@@ -8,6 +8,7 @@ import "ash/public/interfaces/assistant_image_downloader.mojom";
 import "ash/public/interfaces/assistant_setup.mojom";
 import "chromeos/services/assistant/public/mojom/assistant.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
+import "mojo/public/mojom/base/time.mojom";
 
 // Interface to AssistantController which is owned by Shell in Ash. This is
 // typically used by the Assistant service to provide the controller with an
@@ -35,6 +36,50 @@ interface AssistantController {
     bool pii_allowed,
     string feedback_description,
     string screenshot_png);
+
+  // Provides a reference to DeviceActions service.
+  SetDeviceActions(chromeos.assistant.mojom.DeviceActions device_actions);
+};
+
+enum AssistantTimerState {
+  kUnknown,
+  // The timer is scheduled to fire at some future date.
+  kScheduled,
+  // The timer will not fire but is kept in the queue of scheduled events;
+  // it can be resumed after which it will fire in |remaining_duration_ms|.
+  kPaused,
+  // The timer has fired. In the simplest case this means the timer has
+  // begun ringing.
+  kFired,
+};
+
+struct AssistantTimer {
+  string timer_id;
+
+  // The current state of this timer.
+  AssistantTimerState state;
+
+  // TODO(llin): Add more timer data.
+};
+
+// Assistant alarm/timer event type.
+// Currently, the AlarmTimerManager maintains only one firing alarm/timer,
+// the previous one will be dismissed if the second one firing.
+enum AssistantAlarmTimerEventType {
+  kTimer
+  // TODO(llin): Add alarm event type.
+};
+
+union AlarmTimerData {
+  AssistantTimer timer_data;
+  // TODO(llin): Add alarm data.
+};
+
+// A composite struct that will hold exactly one alarm or timer.
+struct AssistantAlarmTimerEvent {
+  AssistantAlarmTimerEventType type;
+
+  AlarmTimerData? data;
 };
 
 // Interface to the AssistantAlarmTimerController which is owned by the
@@ -46,6 +91,10 @@ interface AssistantAlarmTimerController {
 
   // 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);
 };
 
 // Interface to the AssistantNotificationController which is owned by the
diff --git a/chromium/ash/public/interfaces/cros_display_config.mojom b/chromium/ash/public/interfaces/cros_display_config.mojom
index 7039c8b7b7a..ac2899a15f7 100644
--- a/chromium/ash/public/interfaces/cros_display_config.mojom
+++ b/chromium/ash/public/interfaces/cros_display_config.mojom
@@ -63,6 +63,12 @@ enum DisplayConfigOperation {
   kShowNative,
 };
 
+// Describes who initiated configuration change.
+enum DisplayConfigSource {
+  kUser = 0,
+  kPolicy
+};
+
 // Defines a pair of display + touch points used for touch calibration.
 struct TouchCalibrationPair {
   // The coordinates of the display point.
@@ -239,9 +245,12 @@ interface CrosDisplayConfigController {
   GetDisplayUnitInfoList(bool single_unified) =>
     (array<DisplayUnitInfo> info_list);
 
-  // Sets |properties| for individual display with identifier |id|. Returns
-  // Success if the properties are valid or an error value otherwise.
-  SetDisplayProperties(string id, DisplayConfigProperties properties) =>
+  // Sets |properties| for individual display with identifier |id|. |source|
+  // should describe who initiated the change. Returns Success if the properties
+  // are valid or an error value otherwise.
+  SetDisplayProperties(string id,
+                       DisplayConfigProperties properties,
+                       DisplayConfigSource source) =>
     (DisplayConfigResult result);
 
   // Enables or disables unified desktop mode. If the current display mode is
diff --git a/chromium/ash/public/interfaces/login_screen.mojom b/chromium/ash/public/interfaces/login_screen.mojom
index 764af8edcc4..9d2bcc89565 100644
--- a/chromium/ash/public/interfaces/login_screen.mojom
+++ b/chromium/ash/public/interfaces/login_screen.mojom
@@ -51,6 +51,32 @@ enum OobeDialogState {
   HIDDEN = 10,
 };
 
+// Reason why the auth is disabled. This is used to personalize the UI.
+enum AuthDisabledReason {
+  // Auth is disabled because the device is locked by a time limit override.
+  TIME_LIMIT_OVERRIDE,
+
+  // Auth is disabled because the user has reached their daily usage limit on
+  // the device.
+  TIME_USAGE_LIMIT,
+
+  // Auth is disabled because the device is within a locked time window.
+  TIME_WINDOW_LIMIT,
+};
+
+// The data needed to customize the lock screen when auth is disabled.
+struct AuthDisabledData {
+  // Reason why auth is disabled.
+  AuthDisabledReason reason;
+
+  // A future time when auth will be enabled. This value is for display purpose
+  // only, auth won't be automatically enabled when this time is reached.
+  mojo_base.mojom.Time auth_reenabled_time;
+
+  // The amount of time that the user used this device.
+  mojo_base.mojom.TimeDelta device_used_time;
+};
+
 // Allows clients (e.g. the browser process) to send messages to the ash
 // login/lock/user-add screens.
 interface LoginScreen {
@@ -134,19 +160,17 @@ interface LoginScreen {
   // login screen may already be visible.
   SetAvatarForUser(signin.mojom.AccountId account_id, UserAvatar avatar);
 
-  // Called when auth should be enabled or disabled for the given user. When
-  // auth is disabled, the user cannot unlock the device. Auth is enabled by
-  // default.
+  // Called when auth should be enabled for the given user. When auth is
+  // disabled, the user cannot unlock the device. Auth is enabled by default.
+  // |account_id|:            The account id of the user in the user pod.
+  EnableAuthForUser(signin.mojom.AccountId account_id);
+
+  // Called when auth should be disabled for the given user. When auth is
+  // disabled, the user cannot unlock the device. Auth is enabled by default.
   // |account_id|:            The account id of the user in the user pod.
-  // |is_enabled|:            True if auth is enabled.
-  // |auth_reenabled_time|:   A future time when auth will be enabled. Must be
-  //                          non-null if |is_enabled| is false. This value is
-  //                          for display purpose only and the client should be
-  //                          responsible for calling this method again with
-  //                          is_enabled == true when the time reaches.
-  SetAuthEnabledForUser(signin.mojom.AccountId account_id,
-                        bool is_enabled,
-                        mojo_base.mojom.Time? auth_reenabled_time);
+  // |auth_disabled_data|:    The data needed to customize the lock screen UI.
+  DisableAuthForUser(signin.mojom.AccountId account_id,
+                      AuthDisabledData auth_disabled_data);
 
   // Called when focus is reported to be leaving a lock screen app window.
   // Requests focus to be handed off to the next suitable widget.
@@ -195,7 +219,8 @@ interface LoginScreen {
       bool show_full_management_disclosure);
 
   // Update the kiosk app data for the login screen.
-  SetKioskApps(array<KioskAppInfo> kiosk_apps);
+  // Returns true on success.
+  SetKioskApps(array<KioskAppInfo> kiosk_apps) => (bool success);
 
   // Display a toast describing the latest kiosk app launch error.
   ShowKioskAppError(string message);
diff --git a/chromium/ash/public/interfaces/media.mojom b/chromium/ash/public/interfaces/media.mojom
index 474f5a05f13..14866ff1b0c 100644
--- a/chromium/ash/public/interfaces/media.mojom
+++ b/chromium/ash/public/interfaces/media.mojom
@@ -20,6 +20,10 @@ interface MediaController {
   // Sets the client interface.
   SetClient(associated MediaClient client);
 
+  // Forces media shortcut key handling in MediaClient instead of in ash. This
+  // defaults to false and will be reset if the client encounters an error.
+  SetForceMediaClientKeyHandling(bool enabled);
+
   // Called when the media capture state changes on the client, or in response
   // to a RequestCaptureState() request. Returns a map from AccountId to
   // MediaCaptureState representing every user's state.
diff --git a/chromium/ash/public/interfaces/session_controller.mojom b/chromium/ash/public/interfaces/session_controller.mojom
index 07202452261..ac791dd8dbc 100644
--- a/chromium/ash/public/interfaces/session_controller.mojom
+++ b/chromium/ash/public/interfaces/session_controller.mojom
@@ -206,6 +206,10 @@ interface SessionControllerClient {
 
   // Show the multi-profile login UI to add another user to this session.
   ShowMultiProfileLogin();
+
+  // Emits the ash-initialized upstart signal to start Chrome OS tasks that
+  // expect that Ash is listening to D-Bus signals they emit.
+  EmitAshInitialized();
 };
 
 // Interface for ash to notify client of sessions status for a specific
diff --git a/chromium/ash/public/interfaces/shelf.mojom b/chromium/ash/public/interfaces/shelf.mojom
index b048e03502e..9ca03f85f54 100644
--- a/chromium/ash/public/interfaces/shelf.mojom
+++ b/chromium/ash/public/interfaces/shelf.mojom
@@ -9,6 +9,13 @@ import "mojo/public/mojom/base/string16.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/gfx/image/mojo/image.mojom";
 
+// These values match ash::ShelfAutoHideBehavior.
+enum ShelfAutoHideBehavior {
+  SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,  // Always auto-hide.
+  SHELF_AUTO_HIDE_BEHAVIOR_NEVER,   // Never auto-hide.
+  SHELF_AUTO_HIDE_ALWAYS_HIDDEN,    // Always hide.
+};
+
 // The actions that may be performed when a shelf item is selected.
 // These values match ash::ShelfAction.
 enum ShelfAction {
@@ -75,6 +82,17 @@ interface ShelfController {
   UpdateShelfItem(ShelfItem item);
   // Sets the |delegate| for the item with |id|.
   SetShelfItemDelegate(ShelfID id, ShelfItemDelegate delegate);
+  // Returns the auto hide behavior. For testing only.
+  // |display_id| represents the display that contains the shelf. |display_id|
+  // must be valid.
+  GetAutoHideBehaviorForTesting(int64 display_id)
+                                => (ShelfAutoHideBehavior behavior);
+  // Sets the auto hide behavior. For testing only.
+  // |display_id| represents the display that contains the shelf. |display_id|
+  // must be valid.
+  // |behavior| is the new behavior.
+  SetAutoHideBehaviorForTesting(int64 display_id,
+                                ShelfAutoHideBehavior behavior) => ();
 };
 
 // A Shelf observer, used to persist profile settings and cache a ShelfModel.
diff --git a/chromium/ash/public/interfaces/user_info.mojom b/chromium/ash/public/interfaces/user_info.mojom
index c40bb516f12..3e159f909db 100644
--- a/chromium/ash/public/interfaces/user_info.mojom
+++ b/chromium/ash/public/interfaces/user_info.mojom
@@ -64,4 +64,6 @@ struct UserInfo {
   bool is_device_owner;
   // True if the user has a gaia account.
   bool has_gaia_account;
+  // True if should display managed ui.
+  bool should_display_managed_ui;
 };
diff --git a/chromium/ash/public/interfaces/voice_interaction_controller.mojom b/chromium/ash/public/interfaces/voice_interaction_controller.mojom
index b423cba22ad..0c3cc9742c0 100644
--- a/chromium/ash/public/interfaces/voice_interaction_controller.mojom
+++ b/chromium/ash/public/interfaces/voice_interaction_controller.mojom
@@ -39,8 +39,6 @@ enum AssistantAllowedState {
   DISALLOWED_BY_NONPRIMARY_USER,
   // Disallowed because current user is supervised user.
   DISALLOWED_BY_SUPERVISED_USER,
-  // Disallowed because current user is child user.
-  DISALLOWED_BY_CHILD_USER,
   // Disallowed because incognito mode.
   DISALLOWED_BY_INCOGNITO,
   // Disallowed because the device is in demo mode.
@@ -75,6 +73,9 @@ interface VoiceInteractionObserver {
   // 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.
@@ -117,6 +118,9 @@ interface VoiceInteractionController {
   // Called when the launch with mic open state is changed.
   NotifyLaunchWithMicOpen(bool launch_with_mic_open);
 
+  // Called when Google Play Store is enabled/disabled.
+  NotifyArcPlayStoreEnabledChanged(bool enabled);
+
   // Add an observer.
   AddObserver(VoiceInteractionObserver observer);
 };
diff --git a/chromium/ash/public/interfaces/wallpaper.mojom b/chromium/ash/public/interfaces/wallpaper.mojom
index bb5df37697f..e04f2d21c6f 100644
--- a/chromium/ash/public/interfaces/wallpaper.mojom
+++ b/chromium/ash/public/interfaces/wallpaper.mojom
@@ -289,10 +289,10 @@ interface WallpaperControllerClient {
   // able to decide whatever the first wallpaper it wants to display.
   OnReadyToSetWallpaper();
 
-  // TODO(wzang|784495): Consider removing this after views-based login is
-  // enabled.
-  // Notifies the client that the animation of the first wallpaper since
-  // the controller initialization has completed.
+  // Notifies the client that the animation of the first wallpaper since the
+  // controller initialization has completed.
+  // TODO(crbug.com/875128): Remove this after web-ui login code is completely
+  // removed.
   OnFirstWallpaperAnimationFinished();
 };
 
@@ -309,7 +309,8 @@ interface WallpaperObserver {
   // are ordered and are referenced in wallpaper::ColorProfileType.
   OnWallpaperColorsChanged(array<uint32> prominent_colors);
 
-  // TODO(wzang|784495): Remove this after views-based login is enabled.
   // Invoked when the blur state of the wallpaper changes.
+  // TODO(crbug.com/875128): Remove this after web-ui login code is completely
+  // removed.
   OnWallpaperBlurChanged(bool blurred);
 };
diff --git a/chromium/ash/public/interfaces/window_properties.mojom b/chromium/ash/public/interfaces/window_properties.mojom
index 8fae0829fb7..f1ed3686071 100644
--- a/chromium/ash/public/interfaces/window_properties.mojom
+++ b/chromium/ash/public/interfaces/window_properties.mojom
@@ -23,6 +23,9 @@ const string kCanAttachToAnotherWindow_Property =
 const string kCanConsumeSystemKeys_Property =
   "ash:can-consume-system-keys";
 
+// True if the window should be hidden in ash overview mode. Type: bool.
+const string kHideInOverview_Property = "ash:hide_in_overview";
+
 // True if the shelf should be hidden when this window is put into fullscreen.
 // Exposed because some windows want to explicitly opt-out of this.
 const string kHideShelfWhenFullscreen_Property =