| Index: ash/display/screen_ash.h
|
| diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
|
| index c5f4b85b8b7262f4289fda0e9853b09b5e9325a5..8b0cb2cbdc34d5b151e2a5cdf8d5d7dfd349571d 100644
|
| --- a/ash/display/screen_ash.h
|
| +++ b/ash/display/screen_ash.h
|
| @@ -61,22 +61,22 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
|
| static const gfx::Display& GetDisplayForId(int64 display_id);
|
|
|
| // 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:
|
| friend class DisplayManager;
|
|
|