BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 0 insertions, 45 deletions

diff --git a/chromium/ash/public/mojom/assistant_controller.mojom b/chromium/ash/public/mojom/assistant_controller.mojom
index fcfe47f94ca..f3fd9538d3a 100644
--- a/chromium/ash/public/mojom/assistant_controller.mojom
+++ b/chromium/ash/public/mojom/assistant_controller.mojom
@@ -5,41 +5,6 @@
 module ash.mojom;
 
 import "chromeos/services/assistant/public/mojom/assistant_notification.mojom";
-import "mojo/public/mojom/base/time.mojom";
-import "ui/gfx/geometry/mojom/geometry.mojom";
-
-// Represents the current state of an Assistant timer.
-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_time|.
-  kPaused,
-
-  // The timer has fired. In the simplest case this means the timer has
-  // begun ringing.
-  kFired,
-};
-
-// Models an Assistant timer.
-struct AssistantTimer {
-  string id;
-  string label;
-  AssistantTimerState state;
-  mojo_base.mojom.Time fire_time;
-  mojo_base.mojom.TimeDelta remaining_time;
-};
-
-// Interface to the AssistantAlarmTimerController which is owned by the
-// AssistantController. Currently used by the Assistant service to notify Ash
-// of changes to the underlying alarm/timer state in LibAssistant.
-interface AssistantAlarmTimerController {
-  // Invoked when timer state has changed. Note that |timers| may be empty.
-  OnTimerStateChanged(array<AssistantTimer> timers);
-};
 
 // Interface to the AssistantNotificationController which is owned by the
 // AssistantController. Currently used by the Assistant service to modify
@@ -67,13 +32,3 @@ interface AssistantNotificationController {
   // Changes the quiet mode state in the message center.
   SetQuietMode(bool enabled);
 };
-
-// Interface to the AssistantScreenContextController which is owned by the
-// AssistantController. Currently used by the Assistant service to request
-// screenshots.
-interface AssistantScreenContextController {
-  // Requests a screenshot of the region enclosed by |rect| and returns the
-  // screenshot encoded in JPEG format. If |rect| is empty, it returns a
-  // fullscreen screenshot.
-  RequestScreenshot(gfx.mojom.Rect rect) => (array<uint8> screenshot);
-};