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

Unified Diff: ui/app_list/views/folder_header_view_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/app_list/views/folder_header_view.h ('k') | ui/app_list/views/page_switcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 34f1984c6af5674a54f98cec2d203a78d3a735e1..6408adbf4e6a4ac587eb79434c3e3ccb1b3664c9 100644
--- a/ui/app_list/views/folder_header_view_unittest.cc
+++ b/ui/app_list/views/folder_header_view_unittest.cc
@@ -32,12 +32,12 @@ class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate {
// FolderHeaderViewDelegate
virtual void NavigateBack(AppListFolderItem* item,
- const ui::Event& event_flags) OVERRIDE {}
+ const ui::Event& event_flags) override {}
- virtual void GiveBackFocusToSearchBox() OVERRIDE {}
+ virtual void GiveBackFocusToSearchBox() override {}
virtual void SetItemName(AppListFolderItem* item,
- const std::string& name) OVERRIDE {
+ const std::string& name) override {
folder_name_ = name;
}
@@ -57,7 +57,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase {
virtual ~FolderHeaderViewTest() {}
// testing::Test overrides:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
views::ViewsTestBase::SetUp();
model_.reset(new AppListTestModel);
model_->SetFoldersEnabled(true);
@@ -66,7 +66,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase {
folder_header_view_.reset(new FolderHeaderView(delegate_.get()));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
folder_header_view_.reset(); // Release apps grid view before models.
delegate_.reset();
views::ViewsTestBase::TearDown();
« no previous file with comments | « ui/app_list/views/folder_header_view.h ('k') | ui/app_list/views/page_switcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698