| 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 e1ed1348bded20e028e412e453eaa385bc4812d7..e76fd96f7da43e16bd0fd73a3a077fa71c37656b 100644
|
| --- a/ash/wm/lock_layout_manager_unittest.cc
|
| +++ b/ash/wm/lock_layout_manager_unittest.cc
|
| @@ -33,24 +33,14 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate {
|
| public:
|
| explicit LoginTestWidgetDelegate(views::Widget* widget) : widget_(widget) {
|
| }
|
| - virtual ~LoginTestWidgetDelegate() {}
|
| + ~LoginTestWidgetDelegate() override {}
|
|
|
| // Overridden from WidgetDelegate:
|
| - virtual void DeleteDelegate() override {
|
| - delete this;
|
| - }
|
| - virtual views::Widget* GetWidget() override {
|
| - return widget_;
|
| - }
|
| - virtual const views::Widget* GetWidget() const override {
|
| - return widget_;
|
| - }
|
| - virtual bool CanActivate() const override {
|
| - return true;
|
| - }
|
| - virtual bool ShouldAdvanceFocusToTopLevelWidget() const override {
|
| - return true;
|
| - }
|
| + void DeleteDelegate() override { delete this; }
|
| + views::Widget* GetWidget() override { return widget_; }
|
| + const views::Widget* GetWidget() const override { return widget_; }
|
| + bool CanActivate() const override { return true; }
|
| + bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; }
|
|
|
| private:
|
| views::Widget* widget_;
|
| @@ -62,7 +52,7 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate {
|
|
|
| class LockLayoutManagerTest : 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);
|
| @@ -71,7 +61,7 @@ class LockLayoutManagerTest : public AshTestBase {
|
| keyboard::KeyboardController::GetInstance());
|
| }
|
|
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
|
| keyboard::KeyboardController::GetInstance());
|
| AshTestBase::TearDown();
|
|
|