Index: ui/gfx/screen_mac.mm |
diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm |
index 0b1f41f61d2aee0f9f33c2da94f09b9e5bc07543..c07dd8023066620c84960ea39afec287dcc062ca 100644 |
--- a/ui/gfx/screen_mac.mm |
+++ b/ui/gfx/screen_mac.mm |
@@ -91,11 +91,11 @@ class ScreenMac : public gfx::Screen { |
ScreenMac::DisplayReconfigurationCallBack, this); |
} |
- virtual bool IsDIPEnabled() OVERRIDE { |
+ virtual bool IsDIPEnabled() override { |
return true; |
} |
- virtual gfx::Point GetCursorScreenPoint() OVERRIDE { |
+ virtual gfx::Point GetCursorScreenPoint() override { |
NSPoint mouseLocation = [NSEvent mouseLocation]; |
// Flip coordinates to gfx (0,0 in top-left corner) using primary screen. |
NSScreen* screen = [[NSScreen screens] objectAtIndex:0]; |
@@ -103,28 +103,28 @@ class ScreenMac : public gfx::Screen { |
return gfx::Point(mouseLocation.x, mouseLocation.y); |
} |
- 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 { |
return GetAllDisplays().size(); |
} |
- virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { |
+ virtual std::vector<gfx::Display> GetAllDisplays() const override { |
return displays_; |
} |
virtual gfx::Display GetDisplayNearestWindow( |
- gfx::NativeView view) const OVERRIDE { |
+ gfx::NativeView view) const override { |
NSWindow* window = nil; |
#if !defined(USE_AURA) |
if (view) |
@@ -139,7 +139,7 @@ class ScreenMac : public gfx::Screen { |
} |
virtual gfx::Display GetDisplayNearestPoint( |
- const gfx::Point& point) const OVERRIDE { |
+ const gfx::Point& point) const override { |
NSPoint ns_point = NSPointFromCGPoint(point.ToCGPoint()); |
NSArray* screens = [NSScreen screens]; |
@@ -154,13 +154,13 @@ class ScreenMac : public gfx::Screen { |
// 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 { |
NSScreen* match_screen = GetMatchingScreen(match_rect); |
return GetDisplayForScreen(match_screen); |
} |
// Returns the primary display. |
- virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { |
+ virtual gfx::Display GetPrimaryDisplay() const override { |
// Primary display is defined as the display with the menubar, |
// which is always at index 0. |
NSScreen* primary = [[NSScreen screens] objectAtIndex:0]; |
@@ -168,11 +168,11 @@ class ScreenMac : public gfx::Screen { |
return display; |
} |
- virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { |
+ virtual void AddObserver(gfx::DisplayObserver* observer) override { |
change_notifier_.AddObserver(observer); |
} |
- virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { |
+ virtual void RemoveObserver(gfx::DisplayObserver* observer) override { |
change_notifier_.RemoveObserver(observer); |
} |