| 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/common/system/date/date_view.h" | 5 #include "ash/system/date/date_view.h" |
| 6 | 6 |
| 7 #include "ash/common/test/ash_test.h" | 7 #include "ash/common/test/ash_test.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 AshTest { | 13 class TimeViewTest : public AshTest { |
| 14 public: | 14 public: |
| 15 TimeViewTest() {} | 15 TimeViewTest() {} |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 // Switching back to horizontal updates the labels again. | 56 // Switching back to horizontal updates the labels again. |
| 57 time_view()->UpdateClockLayout(TimeView::ClockLayout::HORIZONTAL_CLOCK); | 57 time_view()->UpdateClockLayout(TimeView::ClockLayout::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 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
