| Index: chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
|
| diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
|
| index 323ed824388406a285ceeb15145ed246364d7091..38c4263dd3a28644d4a1c0cbdab3c76c4246bae9 100644
|
| --- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
|
| +++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
|
| @@ -25,37 +25,37 @@ class TestScreen : public gfx::Screen {
|
| virtual ~TestScreen() {}
|
|
|
| // Overridden from gfx::Screen:
|
| - virtual bool IsDIPEnabled() OVERRIDE {
|
| + virtual bool IsDIPEnabled() override {
|
| NOTREACHED();
|
| return false;
|
| }
|
|
|
| - virtual gfx::Point GetCursorScreenPoint() OVERRIDE {
|
| + virtual gfx::Point GetCursorScreenPoint() override {
|
| NOTREACHED();
|
| return gfx::Point();
|
| }
|
|
|
| - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
|
| + virtual gfx::NativeWindow GetWindowUnderCursor() override {
|
| NOTREACHED();
|
| return NULL;
|
| }
|
|
|
| virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
|
| - OVERRIDE {
|
| + override {
|
| NOTREACHED();
|
| return NULL;
|
| }
|
|
|
| - virtual int GetNumDisplays() const OVERRIDE {
|
| + virtual int GetNumDisplays() const override {
|
| return displays_.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 {
|
| #if defined(USE_AURA)
|
| return GetDisplayMatching(view->GetBoundsInScreen());
|
| #else
|
| @@ -65,13 +65,13 @@ class TestScreen : public gfx::Screen {
|
| }
|
|
|
| virtual gfx::Display GetDisplayNearestPoint(
|
| - const gfx::Point& point) const OVERRIDE {
|
| + const gfx::Point& point) const override {
|
| NOTREACHED();
|
| return gfx::Display();
|
| }
|
|
|
| virtual gfx::Display GetDisplayMatching(
|
| - const gfx::Rect& match_rect) const OVERRIDE {
|
| + const gfx::Rect& match_rect) const override {
|
| int max_area = 0;
|
| size_t max_area_index = 0;
|
|
|
| @@ -87,15 +87,15 @@ class TestScreen : public gfx::Screen {
|
| return displays_[max_area_index];
|
| }
|
|
|
| - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
|
| + virtual gfx::Display GetPrimaryDisplay() const override {
|
| return displays_[0];
|
| }
|
|
|
| - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
|
| + virtual void AddObserver(gfx::DisplayObserver* observer) override {
|
| NOTREACHED();
|
| }
|
|
|
| - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
|
| + virtual void RemoveObserver(gfx::DisplayObserver* observer) override {
|
| NOTREACHED();
|
| }
|
|
|
| @@ -119,7 +119,7 @@ public:
|
|
|
| virtual gfx::Display GetTargetDisplay(
|
| const gfx::Screen* screen,
|
| - const gfx::Rect& bounds) const OVERRIDE {
|
| + const gfx::Rect& bounds) const override {
|
| // On ash, the bounds is used as a indicator to specify
|
| // the target display.
|
| return screen->GetDisplayMatching(bounds);
|
|
|