| OLD | NEW |
| 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 internal { | |
| 12 namespace tray { | 11 namespace tray { |
| 13 | 12 |
| 14 class TimeViewTest : public ash::test::AshTestBase { | 13 class TimeViewTest : public ash::test::AshTestBase { |
| 15 public: | 14 public: |
| 16 TimeViewTest() {} | 15 TimeViewTest() {} |
| 17 virtual ~TimeViewTest() {} | 16 virtual ~TimeViewTest() {} |
| 18 | 17 |
| 19 TimeView* time_view() { return time_view_.get(); } | 18 TimeView* time_view() { return time_view_.get(); } |
| 20 | 19 |
| 21 // Access to private fields of |time_view_|. | 20 // Access to private fields of |time_view_|. |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 EXPECT_EQ(time_view(), vertical_label_minutes()->parent()); | 54 EXPECT_EQ(time_view(), vertical_label_minutes()->parent()); |
| 56 | 55 |
| 57 // Switching back to horizontal updates the labels again. | 56 // Switching back to horizontal updates the labels again. |
| 58 time_view()->UpdateClockLayout(TrayDate::HORIZONTAL_CLOCK); | 57 time_view()->UpdateClockLayout(TrayDate::HORIZONTAL_CLOCK); |
| 59 EXPECT_EQ(time_view(), horizontal_label()->parent()); | 58 EXPECT_EQ(time_view(), horizontal_label()->parent()); |
| 60 EXPECT_FALSE(vertical_label_hours()->parent()); | 59 EXPECT_FALSE(vertical_label_hours()->parent()); |
| 61 EXPECT_FALSE(vertical_label_minutes()->parent()); | 60 EXPECT_FALSE(vertical_label_minutes()->parent()); |
| 62 } | 61 } |
| 63 | 62 |
| 64 } // namespace tray | 63 } // namespace tray |
| 65 } // namespace internal | |
| 66 } // namespace ash | 64 } // namespace ash |
| OLD | NEW |