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

Unified Diff: ash/wm/lock_layout_manager_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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/lock_layout_manager.h ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_layout_manager_unittest.cc
diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc
index b680ba21a9718b90be2d2ac460415b33f5b40134..e1ed1348bded20e028e412e453eaa385bc4812d7 100644
--- a/ash/wm/lock_layout_manager_unittest.cc
+++ b/ash/wm/lock_layout_manager_unittest.cc
@@ -36,19 +36,19 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate {
virtual ~LoginTestWidgetDelegate() {}
// Overridden from WidgetDelegate:
- virtual void DeleteDelegate() OVERRIDE {
+ virtual void DeleteDelegate() override {
delete this;
}
- virtual views::Widget* GetWidget() OVERRIDE {
+ virtual views::Widget* GetWidget() override {
return widget_;
}
- virtual const views::Widget* GetWidget() const OVERRIDE {
+ virtual const views::Widget* GetWidget() const override {
return widget_;
}
- virtual bool CanActivate() const OVERRIDE {
+ virtual bool CanActivate() const override {
return true;
}
- virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE {
+ virtual bool ShouldAdvanceFocusToTopLevelWidget() const override {
return true;
}
@@ -62,7 +62,7 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate {
class LockLayoutManagerTest : public AshTestBase {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// Allow a virtual keyboard (and initialize it per default).
CommandLine::ForCurrentProcess()->AppendSwitch(
keyboard::switches::kEnableVirtualKeyboard);
@@ -71,7 +71,7 @@ class LockLayoutManagerTest : public AshTestBase {
keyboard::KeyboardController::GetInstance());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
keyboard::KeyboardController::GetInstance());
AshTestBase::TearDown();
« no previous file with comments | « ash/wm/lock_layout_manager.h ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698