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

Side by Side Diff: ash/system/tray/system_tray_unittest.cc

Issue 685483004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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 | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/throbber_view.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 SystemTray* GetSystemTray() { 46 SystemTray* GetSystemTray() {
47 return Shell::GetPrimaryRootWindowController()->shelf()-> 47 return Shell::GetPrimaryRootWindowController()->shelf()->
48 status_area_widget()->system_tray(); 48 status_area_widget()->system_tray();
49 } 49 }
50 50
51 // Trivial item implementation that tracks its views for testing. 51 // Trivial item implementation that tracks its views for testing.
52 class TestItem : public SystemTrayItem { 52 class TestItem : public SystemTrayItem {
53 public: 53 public:
54 TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {} 54 TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {}
55 55
56 virtual views::View* CreateTrayView(user::LoginStatus status) override { 56 views::View* CreateTrayView(user::LoginStatus status) override {
57 tray_view_ = new views::View; 57 tray_view_ = new views::View;
58 // Add a label so it has non-zero width. 58 // Add a label so it has non-zero width.
59 tray_view_->SetLayoutManager(new views::FillLayout); 59 tray_view_->SetLayoutManager(new views::FillLayout);
60 tray_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Tray"))); 60 tray_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Tray")));
61 return tray_view_; 61 return tray_view_;
62 } 62 }
63 63
64 virtual views::View* CreateDefaultView(user::LoginStatus status) override { 64 views::View* CreateDefaultView(user::LoginStatus status) override {
65 default_view_ = new views::View; 65 default_view_ = new views::View;
66 default_view_->SetLayoutManager(new views::FillLayout); 66 default_view_->SetLayoutManager(new views::FillLayout);
67 default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default"))); 67 default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default")));
68 return default_view_; 68 return default_view_;
69 } 69 }
70 70
71 virtual views::View* CreateDetailedView(user::LoginStatus status) override { 71 views::View* CreateDetailedView(user::LoginStatus status) override {
72 detailed_view_ = new views::View; 72 detailed_view_ = new views::View;
73 detailed_view_->SetLayoutManager(new views::FillLayout); 73 detailed_view_->SetLayoutManager(new views::FillLayout);
74 detailed_view_->AddChildView( 74 detailed_view_->AddChildView(
75 new views::Label(base::UTF8ToUTF16("Detailed"))); 75 new views::Label(base::UTF8ToUTF16("Detailed")));
76 return detailed_view_; 76 return detailed_view_;
77 } 77 }
78 78
79 virtual views::View* CreateNotificationView( 79 views::View* CreateNotificationView(user::LoginStatus status) override {
80 user::LoginStatus status) override {
81 notification_view_ = new views::View; 80 notification_view_ = new views::View;
82 return notification_view_; 81 return notification_view_;
83 } 82 }
84 83
85 virtual void DestroyTrayView() override { 84 void DestroyTrayView() override { tray_view_ = NULL; }
86 tray_view_ = NULL;
87 }
88 85
89 virtual void DestroyDefaultView() override { 86 void DestroyDefaultView() override { default_view_ = NULL; }
90 default_view_ = NULL;
91 }
92 87
93 virtual void DestroyDetailedView() override { 88 void DestroyDetailedView() override { detailed_view_ = NULL; }
94 detailed_view_ = NULL;
95 }
96 89
97 virtual void DestroyNotificationView() override { 90 void DestroyNotificationView() override { notification_view_ = NULL; }
98 notification_view_ = NULL;
99 }
100 91
101 virtual void UpdateAfterLoginStatusChange( 92 void UpdateAfterLoginStatusChange(user::LoginStatus status) override {}
102 user::LoginStatus status) override {
103 }
104 93
105 views::View* tray_view() const { return tray_view_; } 94 views::View* tray_view() const { return tray_view_; }
106 views::View* default_view() const { return default_view_; } 95 views::View* default_view() const { return default_view_; }
107 views::View* detailed_view() const { return detailed_view_; } 96 views::View* detailed_view() const { return detailed_view_; }
108 views::View* notification_view() const { return notification_view_; } 97 views::View* notification_view() const { return notification_view_; }
109 98
110 private: 99 private:
111 views::View* tray_view_; 100 views::View* tray_view_;
112 views::View* default_view_; 101 views::View* default_view_;
113 views::View* detailed_view_; 102 views::View* detailed_view_;
114 views::View* notification_view_; 103 views::View* notification_view_;
115 }; 104 };
116 105
117 // Trivial item implementation that returns NULL from tray/default/detailed 106 // Trivial item implementation that returns NULL from tray/default/detailed
118 // view creation methods. 107 // view creation methods.
119 class TestNoViewItem : public SystemTrayItem { 108 class TestNoViewItem : public SystemTrayItem {
120 public: 109 public:
121 TestNoViewItem() : SystemTrayItem(GetSystemTray()) {} 110 TestNoViewItem() : SystemTrayItem(GetSystemTray()) {}
122 111
123 virtual views::View* CreateTrayView(user::LoginStatus status) override { 112 views::View* CreateTrayView(user::LoginStatus status) override {
124 return NULL; 113 return NULL;
125 } 114 }
126 115
127 virtual views::View* CreateDefaultView(user::LoginStatus status) override { 116 views::View* CreateDefaultView(user::LoginStatus status) override {
128 return NULL; 117 return NULL;
129 } 118 }
130 119
131 virtual views::View* CreateDetailedView(user::LoginStatus status) override { 120 views::View* CreateDetailedView(user::LoginStatus status) override {
132 return NULL; 121 return NULL;
133 } 122 }
134 123
135 virtual views::View* CreateNotificationView( 124 views::View* CreateNotificationView(user::LoginStatus status) override {
136 user::LoginStatus status) override {
137 return NULL; 125 return NULL;
138 } 126 }
139 127
140 virtual void DestroyTrayView() override {} 128 void DestroyTrayView() override {}
141 virtual void DestroyDefaultView() override {} 129 void DestroyDefaultView() override {}
142 virtual void DestroyDetailedView() override {} 130 void DestroyDetailedView() override {}
143 virtual void DestroyNotificationView() override {} 131 void DestroyNotificationView() override {}
144 virtual void UpdateAfterLoginStatusChange( 132 void UpdateAfterLoginStatusChange(user::LoginStatus status) override {}
145 user::LoginStatus status) override {
146 }
147 }; 133 };
148 134
149 class ModalWidgetDelegate : public views::WidgetDelegateView { 135 class ModalWidgetDelegate : public views::WidgetDelegateView {
150 public: 136 public:
151 ModalWidgetDelegate() {} 137 ModalWidgetDelegate() {}
152 virtual ~ModalWidgetDelegate() {} 138 ~ModalWidgetDelegate() override {}
153 139
154 virtual views::View* GetContentsView() override { return this; } 140 views::View* GetContentsView() override { return this; }
155 virtual ui::ModalType GetModalType() const override { 141 ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
156 return ui::MODAL_TYPE_SYSTEM;
157 }
158 142
159 private: 143 private:
160 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate); 144 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
161 }; 145 };
162 146
163 } // namespace 147 } // namespace
164 148
165 class SystemTrayTest : public AshTestBase { 149 class SystemTrayTest : public AshTestBase {
166 public: 150 public:
167 SystemTrayTest() {} 151 SystemTrayTest() {}
168 virtual ~SystemTrayTest() {} 152 ~SystemTrayTest() override {}
169 153
170 virtual void SetUp() override { 154 void SetUp() override {
171 CommandLine::ForCurrentProcess()->AppendSwitch( 155 CommandLine::ForCurrentProcess()->AppendSwitch(
172 switches::kEnableTouchFeedback); 156 switches::kEnableTouchFeedback);
173 test::AshTestBase::SetUp(); 157 test::AshTestBase::SetUp();
174 } 158 }
175 159
176 private: 160 private:
177 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest); 161 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest);
178 }; 162 };
179 163
180 TEST_F(SystemTrayTest, SystemTrayDefaultView) { 164 TEST_F(SystemTrayTest, SystemTrayDefaultView) {
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 555
572 generator.set_current_location(move_point); 556 generator.set_current_location(move_point);
573 generator.ReleaseTouch(); 557 generator.ReleaseTouch();
574 RunAllPendingInMessageLoop(); 558 RunAllPendingInMessageLoop();
575 EXPECT_FALSE(view->active()); 559 EXPECT_FALSE(view->active());
576 } 560 }
577 #endif // OS_CHROMEOS 561 #endif // OS_CHROMEOS
578 562
579 } // namespace test 563 } // namespace test
580 } // namespace ash 564 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/throbber_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698