Index: ui/gfx/screen_ios.mm |
diff --git a/ui/gfx/screen_ios.mm b/ui/gfx/screen_ios.mm |
index f630f00a9f04740d20bea44f922b22f7a380af73..ac5ccc482a8251a9bbf51ff33c20fa2a94c2da38 100644 |
--- a/ui/gfx/screen_ios.mm |
+++ b/ui/gfx/screen_ios.mm |
@@ -12,27 +12,27 @@ |
namespace { |
class ScreenIos : public gfx::Screen { |
- virtual bool IsDIPEnabled() OVERRIDE { |
+ virtual bool IsDIPEnabled() override { |
return true; |
} |
- virtual gfx::Point GetCursorScreenPoint() OVERRIDE { |
+ virtual gfx::Point GetCursorScreenPoint() override { |
NOTIMPLEMENTED(); |
return gfx::Point(0, 0); |
} |
- virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { |
+ virtual gfx::NativeWindow GetWindowUnderCursor() override { |
NOTIMPLEMENTED(); |
return gfx::NativeWindow(); |
} |
virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) |
- OVERRIDE { |
+ override { |
NOTIMPLEMENTED(); |
return gfx::NativeWindow(); |
} |
- virtual int GetNumDisplays() const OVERRIDE { |
+ virtual int GetNumDisplays() const override { |
#if TARGET_IPHONE_SIMULATOR |
// UIScreen does not reliably return correct results on the simulator. |
return 1; |
@@ -41,34 +41,34 @@ class ScreenIos : public gfx::Screen { |
#endif |
} |
- virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { |
+ virtual std::vector<gfx::Display> GetAllDisplays() const override { |
NOTIMPLEMENTED(); |
return std::vector<gfx::Display>(1, GetPrimaryDisplay()); |
} |
// Returns the display nearest the specified window. |
virtual gfx::Display GetDisplayNearestWindow( |
- gfx::NativeView view) const OVERRIDE { |
+ gfx::NativeView view) const override { |
NOTIMPLEMENTED(); |
return gfx::Display(); |
} |
// Returns the the display nearest the specified point. |
virtual gfx::Display GetDisplayNearestPoint( |
- const gfx::Point& point) const OVERRIDE { |
+ const gfx::Point& point) const override { |
NOTIMPLEMENTED(); |
return gfx::Display(); |
} |
// Returns the display that most closely intersects the provided bounds. |
virtual gfx::Display GetDisplayMatching( |
- const gfx::Rect& match_rect) const OVERRIDE { |
+ const gfx::Rect& match_rect) const override { |
NOTIMPLEMENTED(); |
return gfx::Display(); |
} |
// Returns the primary display. |
- virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { |
+ virtual gfx::Display GetPrimaryDisplay() const override { |
UIScreen* mainScreen = [UIScreen mainScreen]; |
CHECK(mainScreen); |
gfx::Display display(0, gfx::Rect(mainScreen.bounds)); |
@@ -76,11 +76,11 @@ class ScreenIos : public gfx::Screen { |
return display; |
} |
- virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { |
+ virtual void AddObserver(gfx::DisplayObserver* observer) override { |
// no display change on iOS. |
} |
- virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { |
+ virtual void RemoveObserver(gfx::DisplayObserver* observer) override { |
// no display change on iOS. |
} |
}; |