Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4261)

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 776028828f7d1abdfc819afbde45e551620d18e0..2be813b2f6eca8a054fab54cfae89327b7bcb311 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);

Powered by Google App Engine
This is Rietveld 408576698