Index: ui/app_list/views/app_list_view_unittest.cc |
diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc |
index 513024004d35df51d3821883cb3a4cc4f048c62d..bd5a7b2972bb47843fd33770f8447fa305095919 100644 |
--- a/ui/app_list/views/app_list_view_unittest.cc |
+++ b/ui/app_list/views/app_list_view_unittest.cc |
@@ -61,7 +61,7 @@ const int kInitialItems = 34; |
class TestTileSearchResult : public TestSearchResult { |
public: |
TestTileSearchResult() { set_display_type(DISPLAY_TILE); } |
- virtual ~TestTileSearchResult() {} |
+ ~TestTileSearchResult() override {} |
private: |
DISALLOW_COPY_AND_ASSIGN(TestTileSearchResult); |
@@ -140,12 +140,12 @@ class UnitTestViewDelegate : public app_list::test::AppListTestViewDelegate { |
UnitTestViewDelegate(AppListViewTestContext* parent) : parent_(parent) {} |
// Overridden from app_list::AppListViewDelegate: |
- virtual bool ShouldCenterWindow() const override { |
+ bool ShouldCenterWindow() const override { |
return app_list::switches::IsCenteredAppListEnabled(); |
} |
// Overridden from app_list::test::AppListTestViewDelegate: |
- virtual void ViewClosing() override { parent_->NativeWidgetClosing(); } |
+ void ViewClosing() override { parent_->NativeWidgetClosing(); } |
private: |
AppListViewTestContext* parent_; |
@@ -569,7 +569,7 @@ class AppListViewTestAura : public views::ViewsTestBase, |
virtual ~AppListViewTestAura() {} |
// testing::Test overrides: |
- virtual void SetUp() override { |
+ void SetUp() override { |
views::ViewsTestBase::SetUp(); |
// On Ash (only) the app list is placed into an aura::Window "container", |
@@ -584,7 +584,7 @@ class AppListViewTestAura : public views::ViewsTestBase, |
test_context_.reset(new AppListViewTestContext(GetParam(), container)); |
} |
- virtual void TearDown() override { |
+ void TearDown() override { |
test_context_.reset(); |
views::ViewsTestBase::TearDown(); |
} |
@@ -603,13 +603,13 @@ class AppListViewTestDesktop : public views::ViewsTestBase, |
virtual ~AppListViewTestDesktop() {} |
// testing::Test overrides: |
- virtual void SetUp() override { |
+ void SetUp() override { |
set_views_delegate(new AppListViewTestViewsDelegate(this)); |
views::ViewsTestBase::SetUp(); |
test_context_.reset(new AppListViewTestContext(GetParam(), NULL)); |
} |
- virtual void TearDown() override { |
+ void TearDown() override { |
test_context_.reset(); |
views::ViewsTestBase::TearDown(); |
} |
@@ -624,7 +624,7 @@ class AppListViewTestDesktop : public views::ViewsTestBase, |
: parent_(parent) {} |
// Overridden from views::ViewsDelegate: |
- virtual void OnBeforeWidgetInit( |
+ void OnBeforeWidgetInit( |
views::Widget::InitParams* params, |
views::internal::NativeWidgetDelegate* delegate) override; |