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

Side by Side Diff: athena/home/athena_start_page_view_unittest.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 "athena/home/athena_start_page_view.h" 5 #include "athena/home/athena_start_page_view.h"
6 6
7 #include "athena/home/home_card_constants.h" 7 #include "athena/home/home_card_constants.h"
8 #include "athena/test/base/athena_test_base.h" 8 #include "athena/test/base/athena_test_base.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 15 matching lines...) Expand all
26 26
27 } 27 }
28 28
29 class AthenaTestViewDelegate : public app_list::test::AppListTestViewDelegate { 29 class AthenaTestViewDelegate : public app_list::test::AppListTestViewDelegate {
30 public: 30 public:
31 AthenaTestViewDelegate() {} 31 AthenaTestViewDelegate() {}
32 virtual ~AthenaTestViewDelegate() {} 32 virtual ~AthenaTestViewDelegate() {}
33 33
34 private: 34 private:
35 // app_list::AppListViewDelegate: 35 // app_list::AppListViewDelegate:
36 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE { 36 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override {
37 return new views::View(); 37 return new views::View();
38 } 38 }
39 39
40 DISALLOW_COPY_AND_ASSIGN(AthenaTestViewDelegate); 40 DISALLOW_COPY_AND_ASSIGN(AthenaTestViewDelegate);
41 }; 41 };
42 42
43 class AthenaStartPageViewTest : public test::AthenaTestBase { 43 class AthenaStartPageViewTest : public test::AthenaTestBase {
44 public: 44 public:
45 AthenaStartPageViewTest() {} 45 AthenaStartPageViewTest() {}
46 virtual ~AthenaStartPageViewTest() {} 46 virtual ~AthenaStartPageViewTest() {}
47 47
48 // testing::Test: 48 // testing::Test:
49 virtual void SetUp() OVERRIDE { 49 virtual void SetUp() override {
50 test::AthenaTestBase::SetUp(); 50 test::AthenaTestBase::SetUp();
51 app_list::test::AppListTestModel* model = view_delegate_.GetTestModel(); 51 app_list::test::AppListTestModel* model = view_delegate_.GetTestModel();
52 for (size_t i = 0; i < kNumApps; ++i) { 52 for (size_t i = 0; i < kNumApps; ++i) {
53 model->AddItem(new app_list::test::AppListTestModel::AppListTestItem( 53 model->AddItem(new app_list::test::AppListTestModel::AppListTestItem(
54 base::StringPrintf("id-%" PRIuS, i), model)); 54 base::StringPrintf("id-%" PRIuS, i), model));
55 } 55 }
56 56
57 view_.reset(new AthenaStartPageView(&view_delegate_)); 57 view_.reset(new AthenaStartPageView(&view_delegate_));
58 SetSize(gfx::Size(1280, 800)); 58 SetSize(gfx::Size(1280, 800));
59 } 59 }
60 virtual void TearDown() OVERRIDE { 60 virtual void TearDown() override {
61 view_.reset(); 61 view_.reset();
62 test::AthenaTestBase::TearDown(); 62 test::AthenaTestBase::TearDown();
63 } 63 }
64 64
65 protected: 65 protected:
66 void SetSize(const gfx::Size& new_size) { 66 void SetSize(const gfx::Size& new_size) {
67 view_->SetSize(new_size); 67 view_->SetSize(new_size);
68 view_->Layout(); 68 view_->Layout();
69 } 69 }
70 70
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 EXPECT_GT(base_search_box_bounds.y(), GetSearchBoxBounds().y()); 220 EXPECT_GT(base_search_box_bounds.y(), GetSearchBoxBounds().y());
221 EXPECT_EQ(query, GetVisibleQuery()); 221 EXPECT_EQ(query, GetVisibleQuery());
222 222
223 SetSearchQuery(base::string16()); 223 SetSearchQuery(base::string16());
224 EXPECT_TRUE(IsLogoVisible()); 224 EXPECT_TRUE(IsLogoVisible());
225 EXPECT_EQ(base_search_box_bounds.ToString(), GetSearchBoxBounds().ToString()); 225 EXPECT_EQ(base_search_box_bounds.ToString(), GetSearchBoxBounds().ToString());
226 EXPECT_TRUE(GetVisibleQuery().empty()); 226 EXPECT_TRUE(GetVisibleQuery().empty());
227 } 227 }
228 228
229 } // namespace athena 229 } // namespace athena
OLDNEW
« no previous file with comments | « athena/home/athena_start_page_view.cc ('k') | athena/home/home_card_gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698