diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-21 05:42:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 12:43:35 +0000 |
| commit | 5dd5ff67b66b15edbb08201cd4c4590861567e4e (patch) | |
| tree | c7e4e91acc3042707d7312b3dcebf73395b6081a /chrome/browser/ui/window_sizer | |
| parent | 9168b2fe3e30afa4fd9a9500ba0725edf97c20a3 (diff) | |
| download | chromium_src-5dd5ff67b66b15edbb08201cd4c4590861567e4e.zip chromium_src-5dd5ff67b66b15edbb08201cd4c4590861567e4e.tar.gz chromium_src-5dd5ff67b66b15edbb08201cd4c4590861567e4e.tar.bz2 | |
Standardize usage of virtual/override/final in chrome/browser/ui/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
BUG=417463
TBR=msw@chromium.org
Review URL: https://codereview.chromium.org/671653002
Cr-Commit-Position: refs/heads/master@{#300476}
Diffstat (limited to 'chrome/browser/ui/window_sizer')
3 files changed, 29 insertions, 46 deletions
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index c1ce273..77a9eab 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc @@ -42,10 +42,9 @@ class DefaultStateProvider : public WindowSizer::StateProvider { } // Overridden from WindowSizer::StateProvider: - virtual bool GetPersistentState( - gfx::Rect* bounds, - gfx::Rect* work_area, - ui::WindowShowState* show_state) const override { + bool GetPersistentState(gfx::Rect* bounds, + gfx::Rect* work_area, + ui::WindowShowState* show_state) const override { DCHECK(bounds); DCHECK(show_state); @@ -85,7 +84,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider { return has_prefs; } - virtual bool GetLastActiveWindowState( + bool GetLastActiveWindowState( gfx::Rect* bounds, ui::WindowShowState* show_state) const override { DCHECK(show_state); @@ -141,11 +140,10 @@ class DefaultStateProvider : public WindowSizer::StateProvider { class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider { public: DefaultTargetDisplayProvider() {} - virtual ~DefaultTargetDisplayProvider() {} + ~DefaultTargetDisplayProvider() override {} - virtual gfx::Display GetTargetDisplay( - const gfx::Screen* screen, - const gfx::Rect& bounds) const override { + gfx::Display GetTargetDisplay(const gfx::Screen* screen, + const gfx::Rect& bounds) const override { #if defined(USE_ASH) bool force_ash = false; // On Windows check if the browser is launched to serve ASH. If yes then 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 7760288..2be813b 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc @@ -22,40 +22,36 @@ namespace { class TestScreen : public gfx::Screen { public: TestScreen() {} - virtual ~TestScreen() {} + ~TestScreen() override {} // Overridden from gfx::Screen: - virtual bool IsDIPEnabled() override { + bool IsDIPEnabled() override { NOTREACHED(); return false; } - virtual gfx::Point GetCursorScreenPoint() override { + gfx::Point GetCursorScreenPoint() override { NOTREACHED(); return gfx::Point(); } - virtual gfx::NativeWindow GetWindowUnderCursor() override { + gfx::NativeWindow GetWindowUnderCursor() override { NOTREACHED(); return NULL; } - virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - override { + gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override { NOTREACHED(); return NULL; } - virtual int GetNumDisplays() const override { - return displays_.size(); - } + int GetNumDisplays() const override { return displays_.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 { #if defined(USE_AURA) return GetDisplayMatching(view->GetBoundsInScreen()); #else @@ -64,14 +60,12 @@ class TestScreen : public gfx::Screen { #endif } - virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const override { + gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override { NOTREACHED(); return gfx::Display(); } - virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const override { + gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override { int max_area = 0; size_t max_area_index = 0; @@ -87,17 +81,11 @@ class TestScreen : public gfx::Screen { return displays_[max_area_index]; } - virtual gfx::Display GetPrimaryDisplay() const override { - return displays_[0]; - } + gfx::Display GetPrimaryDisplay() const override { return displays_[0]; } - virtual void AddObserver(gfx::DisplayObserver* observer) override { - NOTREACHED(); - } + void AddObserver(gfx::DisplayObserver* observer) override { NOTREACHED(); } - virtual void RemoveObserver(gfx::DisplayObserver* observer) override { - NOTREACHED(); - } + void RemoveObserver(gfx::DisplayObserver* observer) override { NOTREACHED(); } void AddDisplay(const gfx::Rect& bounds, const gfx::Rect& work_area) { @@ -115,11 +103,10 @@ class TestScreen : public gfx::Screen { class TestTargetDisplayProvider : public WindowSizer::TargetDisplayProvider { public: TestTargetDisplayProvider() {} - virtual ~TestTargetDisplayProvider() {} + ~TestTargetDisplayProvider() override {} - virtual gfx::Display GetTargetDisplay( - const gfx::Screen* screen, - const gfx::Rect& bounds) const override { + gfx::Display GetTargetDisplay(const gfx::Screen* screen, + const gfx::Rect& bounds) const override { // On ash, the bounds is used as a indicator to specify // the target display. return screen->GetDisplayMatching(bounds); diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h index d2b0aa3..7b0e985 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h +++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h @@ -52,7 +52,7 @@ extern int kWindowTilePixels; class TestStateProvider : public WindowSizer::StateProvider { public: TestStateProvider(); - virtual ~TestStateProvider() {} + ~TestStateProvider() override {} void SetPersistentState(const gfx::Rect& bounds, const gfx::Rect& work_area, @@ -63,13 +63,11 @@ class TestStateProvider : public WindowSizer::StateProvider { bool has_last_active_data); // Overridden from WindowSizer::StateProvider: - virtual bool GetPersistentState( - gfx::Rect* bounds, - gfx::Rect* saved_work_area, - ui::WindowShowState* show_state) const override; - virtual bool GetLastActiveWindowState( - gfx::Rect* bounds, - ui::WindowShowState* show_state) const override; + bool GetPersistentState(gfx::Rect* bounds, + gfx::Rect* saved_work_area, + ui::WindowShowState* show_state) const override; + bool GetLastActiveWindowState(gfx::Rect* bounds, + ui::WindowShowState* show_state) const override; private: gfx::Rect persistent_bounds_; |