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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/views/folder_header_view.h" 5 #include "ui/app_list/views/folder_header_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 25
26 namespace { 26 namespace {
27 27
28 class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate { 28 class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate {
29 public: 29 public:
30 TestFolderHeaderViewDelegate() {} 30 TestFolderHeaderViewDelegate() {}
31 virtual ~TestFolderHeaderViewDelegate() {} 31 virtual ~TestFolderHeaderViewDelegate() {}
32 32
33 // FolderHeaderViewDelegate 33 // FolderHeaderViewDelegate
34 virtual void NavigateBack(AppListFolderItem* item, 34 virtual void NavigateBack(AppListFolderItem* item,
35 const ui::Event& event_flags) OVERRIDE {} 35 const ui::Event& event_flags) override {}
36 36
37 virtual void GiveBackFocusToSearchBox() OVERRIDE {} 37 virtual void GiveBackFocusToSearchBox() override {}
38 38
39 virtual void SetItemName(AppListFolderItem* item, 39 virtual void SetItemName(AppListFolderItem* item,
40 const std::string& name) OVERRIDE { 40 const std::string& name) override {
41 folder_name_ = name; 41 folder_name_ = name;
42 } 42 }
43 43
44 const std::string& folder_name() const { return folder_name_; } 44 const std::string& folder_name() const { return folder_name_; }
45 45
46 private: 46 private:
47 std::string folder_name_; 47 std::string folder_name_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(TestFolderHeaderViewDelegate); 49 DISALLOW_COPY_AND_ASSIGN(TestFolderHeaderViewDelegate);
50 }; 50 };
51 51
52 } // namespace 52 } // namespace
53 53
54 class FolderHeaderViewTest : public views::ViewsTestBase { 54 class FolderHeaderViewTest : public views::ViewsTestBase {
55 public: 55 public:
56 FolderHeaderViewTest() {} 56 FolderHeaderViewTest() {}
57 virtual ~FolderHeaderViewTest() {} 57 virtual ~FolderHeaderViewTest() {}
58 58
59 // testing::Test overrides: 59 // testing::Test overrides:
60 virtual void SetUp() OVERRIDE { 60 virtual void SetUp() override {
61 views::ViewsTestBase::SetUp(); 61 views::ViewsTestBase::SetUp();
62 model_.reset(new AppListTestModel); 62 model_.reset(new AppListTestModel);
63 model_->SetFoldersEnabled(true); 63 model_->SetFoldersEnabled(true);
64 64
65 delegate_.reset(new TestFolderHeaderViewDelegate); 65 delegate_.reset(new TestFolderHeaderViewDelegate);
66 folder_header_view_.reset(new FolderHeaderView(delegate_.get())); 66 folder_header_view_.reset(new FolderHeaderView(delegate_.get()));
67 } 67 }
68 68
69 virtual void TearDown() OVERRIDE { 69 virtual void TearDown() override {
70 folder_header_view_.reset(); // Release apps grid view before models. 70 folder_header_view_.reset(); // Release apps grid view before models.
71 delegate_.reset(); 71 delegate_.reset();
72 views::ViewsTestBase::TearDown(); 72 views::ViewsTestBase::TearDown();
73 } 73 }
74 74
75 protected: 75 protected:
76 void UpdateFolderName(const std::string& name) { 76 void UpdateFolderName(const std::string& name) {
77 base::string16 folder_name = base::UTF8ToUTF16(name); 77 base::string16 folder_name = base::UTF8ToUTF16(name);
78 folder_header_view_->SetFolderNameForTest(folder_name); 78 folder_header_view_->SetFolderNameForTest(folder_name);
79 folder_header_view_->ContentsChanged(NULL, folder_name); 79 folder_header_view_->ContentsChanged(NULL, folder_name);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 TEST_F(FolderHeaderViewTest, OemFolderNameNotEditable) { 129 TEST_F(FolderHeaderViewTest, OemFolderNameNotEditable) {
130 AppListFolderItem* folder_item = model_->CreateAndAddOemFolder("oem folder"); 130 AppListFolderItem* folder_item = model_->CreateAndAddOemFolder("oem folder");
131 folder_header_view_->SetFolderItem(folder_item); 131 folder_header_view_->SetFolderItem(folder_item);
132 EXPECT_EQ("", GetFolderNameFromUI()); 132 EXPECT_EQ("", GetFolderNameFromUI());
133 EXPECT_FALSE(CanEditFolderName()); 133 EXPECT_FALSE(CanEditFolderName());
134 } 134 }
135 135
136 } // namespace test 136 } // namespace test
137 } // namespace app_list 137 } // namespace app_list
OLDNEW
« 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