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

Side by Side Diff: ash/system/date/date_view_unittest.cc

Issue 683473005: 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/date/date_view.h ('k') | ash/system/date/tray_date.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/date/date_view.h" 5 #include "ash/system/date/date_view.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ui/views/controls/label.h" 8 #include "ui/views/controls/label.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace tray { 11 namespace tray {
12 12
13 class TimeViewTest : public ash::test::AshTestBase { 13 class TimeViewTest : public ash::test::AshTestBase {
14 public: 14 public:
15 TimeViewTest() {} 15 TimeViewTest() {}
16 virtual ~TimeViewTest() {} 16 ~TimeViewTest() override {}
17 17
18 TimeView* time_view() { return time_view_.get(); } 18 TimeView* time_view() { return time_view_.get(); }
19 19
20 // Access to private fields of |time_view_|. 20 // Access to private fields of |time_view_|.
21 views::Label* horizontal_label() { 21 views::Label* horizontal_label() {
22 return time_view_->horizontal_label_.get(); 22 return time_view_->horizontal_label_.get();
23 } 23 }
24 views::Label* vertical_label_hours() { 24 views::Label* vertical_label_hours() {
25 return time_view_->vertical_label_hours_.get(); 25 return time_view_->vertical_label_hours_.get();
26 } 26 }
(...skipping 28 matching lines...) Expand all
55 55
56 // Switching back to horizontal updates the labels again. 56 // Switching back to horizontal updates the labels again.
57 time_view()->UpdateClockLayout(TrayDate::HORIZONTAL_CLOCK); 57 time_view()->UpdateClockLayout(TrayDate::HORIZONTAL_CLOCK);
58 EXPECT_EQ(time_view(), horizontal_label()->parent()); 58 EXPECT_EQ(time_view(), horizontal_label()->parent());
59 EXPECT_FALSE(vertical_label_hours()->parent()); 59 EXPECT_FALSE(vertical_label_hours()->parent());
60 EXPECT_FALSE(vertical_label_minutes()->parent()); 60 EXPECT_FALSE(vertical_label_minutes()->parent());
61 } 61 }
62 62
63 } // namespace tray 63 } // namespace tray
64 } // namespace ash 64 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/date_view.h ('k') | ash/system/date/tray_date.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698