| OLD | NEW |
| 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 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_DATE_DATE_VIEW_H_ |
| 6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_DATE_DATE_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/system/date/tray_date.h" | 11 #include "ash/common/system/date/tray_date.h" |
| 12 #include "ash/system/tray/actionable_view.h" | 12 #include "ash/common/system/tray/actionable_view.h" |
| 13 #include "base/i18n/time_formatting.h" | 13 #include "base/i18n/time_formatting.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/timer/timer.h" | 15 #include "base/timer/timer.h" |
| 16 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
| 17 | 17 |
| 18 namespace base { | 18 namespace base { |
| 19 class Time; | 19 class Time; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace views { | 22 namespace views { |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 // The time label is split into two lines for the vertical shelf. | 148 // The time label is split into two lines for the vertical shelf. |
| 149 std::unique_ptr<views::Label> vertical_label_hours_; | 149 std::unique_ptr<views::Label> vertical_label_hours_; |
| 150 std::unique_ptr<views::Label> vertical_label_minutes_; | 150 std::unique_ptr<views::Label> vertical_label_minutes_; |
| 151 | 151 |
| 152 DISALLOW_COPY_AND_ASSIGN(TimeView); | 152 DISALLOW_COPY_AND_ASSIGN(TimeView); |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 } // namespace tray | 155 } // namespace tray |
| 156 } // namespace ash | 156 } // namespace ash |
| 157 | 157 |
| 158 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_ | 158 #endif // ASH_COMMON_SYSTEM_DATE_DATE_VIEW_H_ |
| OLD | NEW |