Index: ui/app_list/views/folder_header_view_unittest.cc |
diff --git a/ui/app_list/views/folder_header_view_unittest.cc b/ui/app_list/views/folder_header_view_unittest.cc |
index 6408adbf4e6a4ac587eb79434c3e3ccb1b3664c9..94a70d6376bc7777768305e2f8d482b498226028 100644 |
--- a/ui/app_list/views/folder_header_view_unittest.cc |
+++ b/ui/app_list/views/folder_header_view_unittest.cc |
@@ -28,16 +28,15 @@ namespace { |
class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate { |
public: |
TestFolderHeaderViewDelegate() {} |
- virtual ~TestFolderHeaderViewDelegate() {} |
+ ~TestFolderHeaderViewDelegate() override {} |
// FolderHeaderViewDelegate |
- virtual void NavigateBack(AppListFolderItem* item, |
- const ui::Event& event_flags) override {} |
+ void NavigateBack(AppListFolderItem* item, |
+ const ui::Event& event_flags) override {} |
- virtual void GiveBackFocusToSearchBox() override {} |
+ void GiveBackFocusToSearchBox() override {} |
- virtual void SetItemName(AppListFolderItem* item, |
- const std::string& name) override { |
+ void SetItemName(AppListFolderItem* item, const std::string& name) override { |
folder_name_ = name; |
} |
@@ -54,10 +53,10 @@ class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate { |
class FolderHeaderViewTest : public views::ViewsTestBase { |
public: |
FolderHeaderViewTest() {} |
- virtual ~FolderHeaderViewTest() {} |
+ ~FolderHeaderViewTest() override {} |
// testing::Test overrides: |
- virtual void SetUp() override { |
+ void SetUp() override { |
views::ViewsTestBase::SetUp(); |
model_.reset(new AppListTestModel); |
model_->SetFoldersEnabled(true); |
@@ -66,7 +65,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase { |
folder_header_view_.reset(new FolderHeaderView(delegate_.get())); |
} |
- virtual void TearDown() override { |
+ void TearDown() override { |
folder_header_view_.reset(); // Release apps grid view before models. |
delegate_.reset(); |
views::ViewsTestBase::TearDown(); |