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

Unified Diff: ash/wm/system_modal_container_layout_manager_unittest.cc

Issue 645513008: Standardize usage of virtual/override/final specifiers. (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
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.h ('k') | ash/wm/toplevel_window_event_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_layout_manager_unittest.cc
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 541242f9879c205bec427bff68e3572d55fa2713..de284d151f0875baba5bf94f482229d8ed29456b 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -64,7 +64,7 @@ bool AllRootWindowsHaveModalBackgrounds() {
class TestWindow : public views::WidgetDelegateView {
public:
explicit TestWindow(bool modal) : modal_(modal) {}
- virtual ~TestWindow() {}
+ ~TestWindow() override {}
// The window needs be closed from widget in order for
// aura::client::kModalKey property to be reset.
@@ -73,15 +73,11 @@ class TestWindow : public views::WidgetDelegateView {
}
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() const override {
- return gfx::Size(50, 50);
- }
+ gfx::Size GetPreferredSize() const override { return gfx::Size(50, 50); }
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override {
- return this;
- }
- virtual ui::ModalType GetModalType() const override {
+ views::View* GetContentsView() override { return this; }
+ ui::ModalType GetModalType() const override {
return modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE;
}
@@ -95,7 +91,7 @@ class EventTestWindow : public TestWindow {
public:
explicit EventTestWindow(bool modal) : TestWindow(modal),
mouse_presses_(0) {}
- virtual ~EventTestWindow() {}
+ ~EventTestWindow() override {}
aura::Window* OpenTestWindowWithContext(aura::Window* context) {
views::Widget* widget =
@@ -113,7 +109,7 @@ class EventTestWindow : public TestWindow {
}
// Overridden from views::View:
- virtual bool OnMousePressed(const ui::MouseEvent& event) override {
+ bool OnMousePressed(const ui::MouseEvent& event) override {
mouse_presses_++;
return false;
}
@@ -128,14 +124,12 @@ class EventTestWindow : public TestWindow {
class TransientWindowObserver : public aura::WindowObserver {
public:
TransientWindowObserver() : destroyed_(false) {}
- virtual ~TransientWindowObserver() {}
+ ~TransientWindowObserver() override {}
bool destroyed() const { return destroyed_; }
// Overridden from aura::WindowObserver:
- virtual void OnWindowDestroyed(aura::Window* window) override {
- destroyed_ = true;
- }
+ void OnWindowDestroyed(aura::Window* window) override { destroyed_ = true; }
private:
bool destroyed_;
@@ -147,7 +141,7 @@ class TransientWindowObserver : public aura::WindowObserver {
class SystemModalContainerLayoutManagerTest : public AshTestBase {
public:
- virtual void SetUp() override {
+ void SetUp() override {
// Allow a virtual keyboard (and initialize it per default).
CommandLine::ForCurrentProcess()->AppendSwitch(
keyboard::switches::kEnableVirtualKeyboard);
@@ -156,7 +150,7 @@ class SystemModalContainerLayoutManagerTest : public AshTestBase {
keyboard::KeyboardController::GetInstance());
}
- virtual void TearDown() override {
+ void TearDown() override {
Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
keyboard::KeyboardController::GetInstance());
AshTestBase::TearDown();
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.h ('k') | ash/wm/toplevel_window_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698