Index: mojo/aura/screen_mojo.h |
diff --git a/mojo/aura/screen_mojo.h b/mojo/aura/screen_mojo.h |
index ad50c1cee71166f6628fb0b70841e84a7bc57000..184ccff5fa35c430b2bd9dab39e9ff12162766b3 100644 |
--- a/mojo/aura/screen_mojo.h |
+++ b/mojo/aura/screen_mojo.h |
@@ -5,7 +5,7 @@ |
#ifndef MOJO_AURA_SCREEN_MOJO_H_ |
#define MOJO_AURA_SCREEN_MOJO_H_ |
-#include "base/compiler_specific.h" |
+#include "base/macros.h" |
#include "ui/gfx/display.h" |
#include "ui/gfx/screen.h" |
@@ -24,22 +24,22 @@ class ScreenMojo : public gfx::Screen { |
protected: |
// gfx::Screen overrides: |
- virtual bool IsDIPEnabled() OVERRIDE; |
- virtual gfx::Point GetCursorScreenPoint() OVERRIDE; |
- virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; |
+ 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; |
+ override; |
+ virtual int GetNumDisplays() const override; |
+ virtual std::vector<gfx::Display> GetAllDisplays() const override; |
virtual gfx::Display GetDisplayNearestWindow( |
- gfx::NativeView view) const OVERRIDE; |
+ gfx::NativeView view) const override; |
virtual gfx::Display GetDisplayNearestPoint( |
- const gfx::Point& point) const OVERRIDE; |
+ 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; |
+ 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; |
private: |
explicit ScreenMojo(const gfx::Rect& screen_bounds); |