Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / display / screen_ash.cc

diff --git a/src/ash/display/screen_ash.cc b/src/ash/display/screen_ash.cc
index 607784d..c1e559f 100644 (file)
--- a/src/ash/display/screen_ash.cc
+++ b/src/ash/display/screen_ash.cc
@@ -71,48 +71,32 @@ class ScreenForShutdown : public gfx::Screen {
   }
 
   // gfx::Screen overrides:
-  virtual bool IsDIPEnabled() OVERRIDE {
-    return true;
-  }
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE {
-    return gfx::Point();
-  }
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+  gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
+  gfx::NativeWindow GetWindowUnderCursor() override { return NULL; }
+  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
     return NULL;
   }
-  virtual gfx::NativeWindow GetWindowAtScreenPoint(
-      const gfx::Point& point) OVERRIDE {
-    return NULL;
-  }
-  virtual int GetNumDisplays() const OVERRIDE {
-    return display_list_.size();
-  }
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  int GetNumDisplays() const override { return display_list_.size(); }
+  std::vector<gfx::Display> GetAllDisplays() const override {
     return display_list_;
   }
-  virtual gfx::Display GetDisplayNearestWindow(gfx::NativeView view)
-      const OVERRIDE {
+  gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
     return primary_display_;
   }
-  virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE {
+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
     return FindDisplayNearestPoint(display_list_, point);
   }
-  virtual gfx::Display GetDisplayMatching(const gfx::Rect& match_rect)
-      const OVERRIDE {
+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
     const gfx::Display* matching =
         FindDisplayMatching(display_list_, match_rect);
     // Fallback to the primary display if there is no matching display.
     return matching ? *matching : GetPrimaryDisplay();
   }
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
-    return primary_display_;
-  }
-  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
+  gfx::Display GetPrimaryDisplay() const override { return primary_display_; }
+  void AddObserver(gfx::DisplayObserver* observer) override {
     NOTREACHED() << "Observer should not be added during shutdown";
   }
-  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
-  }
+  void RemoveObserver(gfx::DisplayObserver* observer) override {}
 
  private:
   const std::vector<gfx::Display> display_list_;
@@ -204,10 +188,6 @@ void ScreenAsh::NotifyDisplayRemoved(const gfx::Display& display) {
       gfx::DisplayObserver, observers_, OnDisplayRemoved(display));
 }
 
-bool ScreenAsh::IsDIPEnabled() {
-  return true;
-}
-
 gfx::Point ScreenAsh::GetCursorScreenPoint() {
   return aura::Env::GetInstance()->last_mouse_location();
 }