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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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 | « ash/system/date/date_view.cc ('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 {
(...skipping 16 matching lines...) Expand all
27 views::Label* vertical_label_minutes() { 27 views::Label* vertical_label_minutes() {
28 return time_view_->vertical_label_minutes_.get(); 28 return time_view_->vertical_label_minutes_.get();
29 } 29 }
30 30
31 // Creates a time view with horizontal or vertical |clock_layout|. 31 // Creates a time view with horizontal or vertical |clock_layout|.
32 void CreateTimeView(TrayDate::ClockLayout clock_layout) { 32 void CreateTimeView(TrayDate::ClockLayout clock_layout) {
33 time_view_.reset(new TimeView(clock_layout)); 33 time_view_.reset(new TimeView(clock_layout));
34 } 34 }
35 35
36 private: 36 private:
37 scoped_ptr<TimeView> time_view_; 37 std::unique_ptr<TimeView> time_view_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(TimeViewTest); 39 DISALLOW_COPY_AND_ASSIGN(TimeViewTest);
40 }; 40 };
41 41
42 // Test the basics of the time view, mostly to ensure we don't leak memory. 42 // Test the basics of the time view, mostly to ensure we don't leak memory.
43 TEST_F(TimeViewTest, Basics) { 43 TEST_F(TimeViewTest, Basics) {
44 // A newly created horizontal clock only has the horizontal label. 44 // A newly created horizontal clock only has the horizontal label.
45 CreateTimeView(TrayDate::HORIZONTAL_CLOCK); 45 CreateTimeView(TrayDate::HORIZONTAL_CLOCK);
46 EXPECT_EQ(time_view(), horizontal_label()->parent()); 46 EXPECT_EQ(time_view(), horizontal_label()->parent());
47 EXPECT_FALSE(vertical_label_hours()->parent()); 47 EXPECT_FALSE(vertical_label_hours()->parent());
48 EXPECT_FALSE(vertical_label_minutes()->parent()); 48 EXPECT_FALSE(vertical_label_minutes()->parent());
49 49
50 // Switching the clock to vertical updates the labels. 50 // Switching the clock to vertical updates the labels.
51 time_view()->UpdateClockLayout(TrayDate::VERTICAL_CLOCK); 51 time_view()->UpdateClockLayout(TrayDate::VERTICAL_CLOCK);
52 EXPECT_FALSE(horizontal_label()->parent()); 52 EXPECT_FALSE(horizontal_label()->parent());
53 EXPECT_EQ(time_view(), vertical_label_hours()->parent()); 53 EXPECT_EQ(time_view(), vertical_label_hours()->parent());
54 EXPECT_EQ(time_view(), vertical_label_minutes()->parent()); 54 EXPECT_EQ(time_view(), vertical_label_minutes()->parent());
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.cc ('k') | ash/system/date/tray_date.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698