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_TRAY_DATE_H_ | 5 #ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_ |
6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ | 6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
9 #include "ash/system/date/clock_observer.h" | 11 #include "ash/system/date/clock_observer.h" |
10 #include "ash/system/tray/system_tray_item.h" | 12 #include "ash/system/tray/system_tray_item.h" |
11 #include "base/macros.h" | 13 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 | 14 |
14 namespace views { | 15 namespace views { |
15 class Label; | 16 class Label; |
16 } | 17 } |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 class DateDefaultView; | 20 class DateDefaultView; |
20 #if defined(OS_CHROMEOS) | 21 #if defined(OS_CHROMEOS) |
21 class SystemClockObserver; | 22 class SystemClockObserver; |
22 #endif | 23 #endif |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 void OnSystemClockCanSetTimeChanged(bool can_set_time) override; | 66 void OnSystemClockCanSetTimeChanged(bool can_set_time) override; |
66 void Refresh() override; | 67 void Refresh() override; |
67 | 68 |
68 void SetupLabelForTimeTray(views::Label* label); | 69 void SetupLabelForTimeTray(views::Label* label); |
69 | 70 |
70 tray::TimeView* time_tray_; | 71 tray::TimeView* time_tray_; |
71 DateDefaultView* default_view_; | 72 DateDefaultView* default_view_; |
72 user::LoginStatus login_status_; | 73 user::LoginStatus login_status_; |
73 | 74 |
74 #if defined(OS_CHROMEOS) | 75 #if defined(OS_CHROMEOS) |
75 scoped_ptr<SystemClockObserver> system_clock_observer_; | 76 std::unique_ptr<SystemClockObserver> system_clock_observer_; |
76 #endif | 77 #endif |
77 | 78 |
78 DISALLOW_COPY_AND_ASSIGN(TrayDate); | 79 DISALLOW_COPY_AND_ASSIGN(TrayDate); |
79 }; | 80 }; |
80 | 81 |
81 } // namespace ash | 82 } // namespace ash |
82 | 83 |
83 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ | 84 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ |
OLD | NEW |