BASELINE: Update Chromium to 61.0.3163.99

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

1 files changed, 12 insertions, 7 deletions

diff --git a/chromium/ui/aura/window_tree_host.h b/chromium/ui/aura/window_tree_host.h
index 8271ae64a18..f0757f56ef4 100644
--- a/chromium/ui/aura/window_tree_host.h
+++ b/chromium/ui/aura/window_tree_host.h
@@ -11,16 +11,16 @@
 #include "base/event_types.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
-#include "cc/surfaces/frame_sink_id.h"
+#include "components/viz/common/surfaces/frame_sink_id.h"
 #include "ui/aura/aura_export.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/ime/input_method_delegate.h"
+#include "ui/display/display_observer.h"
 #include "ui/events/event_source.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
-class ICCProfile;
 class Insets;
 class Point;
 class Rect;
@@ -48,7 +48,8 @@ class WindowTreeHostObserver;
 // It provides the accelerated widget and maps events from the native os to
 // aura.
 class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
-                                   public ui::EventSource {
+                                   public ui::EventSource,
+                                   public display::DisplayObserver {
  public:
   ~WindowTreeHost() override;
 
@@ -194,7 +195,7 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
   // If frame_sink_id is not passed in, one will be grabbed from
   // ContextFactoryPrivate.
   void CreateCompositor(
-      const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId());
+      const viz::FrameSinkId& frame_sink_id = viz::FrameSinkId());
 
   void InitCompositor();
   void OnAcceleratedWidgetAvailable();
@@ -216,7 +217,7 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
   virtual void MoveCursorToScreenLocationInPixels(
       const gfx::Point& location_in_pixels) = 0;
 
-  // kCalled when the cursor visibility has changed.
+  // Called when the cursor visibility has changed.
   virtual void OnCursorVisibilityChangedNative(bool show) = 0;
 
   // Shows the WindowTreeHost.
@@ -225,11 +226,15 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
   // Hides the WindowTreeHost.
   virtual void HideImpl() = 0;
 
-  virtual gfx::ICCProfile GetICCProfileForCurrentDisplay();
-
   // Overridden from ui::EventSource:
   ui::EventSink* GetEventSink() override;
 
+  // display::DisplayObserver implementation.
+  void OnDisplayAdded(const display::Display& new_display) override;
+  void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
+                               uint32_t metrics) override;
+
  private:
   friend class test::WindowTreeHostTestApi;