Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ozone / ui / desktop_aura / desktop_screen_wayland.h

diff --git a/src/ozone/ui/desktop_aura/desktop_screen_wayland.h b/src/ozone/ui/desktop_aura/desktop_screen_wayland.h
index c1e744f..29fc6ca 100644 (file)
--- a/src/ozone/ui/desktop_aura/desktop_screen_wayland.h
+++ b/src/ozone/ui/desktop_aura/desktop_screen_wayland.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "ozone/ui/events/output_change_observer.h"
+#include "ui/gfx/display_change_notifier.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
@@ -23,29 +24,26 @@ class DesktopScreenWayland : public gfx::Screen,
   virtual ~DesktopScreenWayland();
 
   // OutputChangeObserver overrides.
-  virtual void OnOutputSizeChanged(unsigned width, unsigned height) OVERRIDE;
+  void OnOutputSizeChanged(unsigned width, unsigned height) override;
 
  private:
   void SetGeometry(const gfx::Rect& geometry);
   // Overridden from gfx::Screen:
-  virtual bool IsDIPEnabled() OVERRIDE;
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE;
-  virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
-      OVERRIDE;
-  virtual int GetNumDisplays() const OVERRIDE;
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE;
-  virtual gfx::Display GetDisplayNearestWindow(
-      gfx::NativeView window) const OVERRIDE;
-  virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE;
-  virtual gfx::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const OVERRIDE;
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
-  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
+  gfx::Point GetCursorScreenPoint() override;
+  gfx::NativeWindow GetWindowUnderCursor() override;
+  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
+  int GetNumDisplays() const override;
+  std::vector<gfx::Display> GetAllDisplays() const override;
+  gfx::Display GetDisplayNearestWindow(gfx::NativeView window) const override;
+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
+  gfx::Display GetPrimaryDisplay() const override;
+  void AddObserver(gfx::DisplayObserver* observer) override;
+  void RemoveObserver(gfx::DisplayObserver* observer) override;
 
   gfx::Rect rect_;
+  gfx::DisplayChangeNotifier change_notifier_;
+
   // The display objects we present to chrome.
   std::vector<gfx::Display> displays_;
   DISALLOW_COPY_AND_ASSIGN(DesktopScreenWayland);