| Index: ui/gfx/screen_mac.mm
|
| diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm
|
| index c07dd8023066620c84960ea39afec287dcc062ca..45f3f4519d1712ce0257c5b2926eb34c59305712 100644
|
| --- a/ui/gfx/screen_mac.mm
|
| +++ b/ui/gfx/screen_mac.mm
|
| @@ -91,11 +91,9 @@ class ScreenMac : public gfx::Screen {
|
| ScreenMac::DisplayReconfigurationCallBack, this);
|
| }
|
|
|
| - virtual bool IsDIPEnabled() override {
|
| - return true;
|
| - }
|
| + bool IsDIPEnabled() override { return true; }
|
|
|
| - virtual gfx::Point GetCursorScreenPoint() override {
|
| + 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 +101,23 @@ class ScreenMac : public gfx::Screen {
|
| return gfx::Point(mouseLocation.x, mouseLocation.y);
|
| }
|
|
|
| - virtual gfx::NativeWindow GetWindowUnderCursor() override {
|
| + gfx::NativeWindow GetWindowUnderCursor() override {
|
| NOTIMPLEMENTED();
|
| return gfx::NativeWindow();
|
| }
|
|
|
| - virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
|
| - override {
|
| + gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
|
| NOTIMPLEMENTED();
|
| return gfx::NativeWindow();
|
| }
|
|
|
| - virtual int GetNumDisplays() const override {
|
| - return GetAllDisplays().size();
|
| -
|
| - }
|
| + int GetNumDisplays() const override { return GetAllDisplays().size(); }
|
|
|
| - virtual std::vector<gfx::Display> GetAllDisplays() const override {
|
| + std::vector<gfx::Display> GetAllDisplays() const override {
|
| return displays_;
|
| }
|
|
|
| - virtual gfx::Display GetDisplayNearestWindow(
|
| - gfx::NativeView view) const override {
|
| + gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
|
| NSWindow* window = nil;
|
| #if !defined(USE_AURA)
|
| if (view)
|
| @@ -138,8 +131,7 @@ class ScreenMac : public gfx::Screen {
|
| return GetDisplayForScreen(match_screen);
|
| }
|
|
|
| - virtual gfx::Display GetDisplayNearestPoint(
|
| - const gfx::Point& point) const override {
|
| + gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
|
| NSPoint ns_point = NSPointFromCGPoint(point.ToCGPoint());
|
|
|
| NSArray* screens = [NSScreen screens];
|
| @@ -153,14 +145,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 {
|
| + gfx::Display GetDisplayMatching(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 {
|
| + 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 +159,11 @@ class ScreenMac : public gfx::Screen {
|
| return display;
|
| }
|
|
|
| - virtual void AddObserver(gfx::DisplayObserver* observer) override {
|
| + void AddObserver(gfx::DisplayObserver* observer) override {
|
| change_notifier_.AddObserver(observer);
|
| }
|
|
|
| - virtual void RemoveObserver(gfx::DisplayObserver* observer) override {
|
| + void RemoveObserver(gfx::DisplayObserver* observer) override {
|
| change_notifier_.RemoveObserver(observer);
|
| }
|
|
|
|
|