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_POWER_TRAY_POWER_DATE_H_ | 5 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_DATE_H_ |
6 #define ASH_SYSTEM_POWER_TRAY_POWER_DATE_H_ | 6 #define ASH_SYSTEM_POWER_TRAY_POWER_DATE_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
| 9 #include "ash/system/power/date_format_observer.h" |
9 #include "ash/system/power/power_status_controller.h" | 10 #include "ash/system/power/power_status_controller.h" |
10 #include "ash/system/tray/system_tray_item.h" | 11 #include "ash/system/tray/system_tray_item.h" |
11 | 12 |
12 namespace ash { | 13 namespace ash { |
13 namespace internal { | 14 namespace internal { |
14 | 15 |
15 namespace tray { | 16 namespace tray { |
16 class DateView; | 17 class DateView; |
17 class PowerPopupView; | 18 class PowerPopupView; |
18 class PowerTrayView; | 19 class PowerTrayView; |
19 } | 20 } |
20 | 21 |
21 class TrayPowerDate : public SystemTrayItem, | 22 class TrayPowerDate : public SystemTrayItem, |
22 public PowerStatusController { | 23 public PowerStatusController, |
| 24 public DateFormatObserver { |
23 public: | 25 public: |
24 TrayPowerDate(); | 26 TrayPowerDate(); |
25 virtual ~TrayPowerDate(); | 27 virtual ~TrayPowerDate(); |
26 | 28 |
27 private: | 29 private: |
28 // Overridden from SystemTrayItem. | 30 // Overridden from SystemTrayItem. |
29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; | 31 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; |
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; |
31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; |
32 virtual void DestroyTrayView() OVERRIDE; | 34 virtual void DestroyTrayView() OVERRIDE; |
33 virtual void DestroyDefaultView() OVERRIDE; | 35 virtual void DestroyDefaultView() OVERRIDE; |
34 virtual void DestroyDetailedView() OVERRIDE; | 36 virtual void DestroyDetailedView() OVERRIDE; |
35 | 37 |
36 // Overridden from PowerStatusController. | 38 // Overridden from PowerStatusController. |
37 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE; | 39 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE; |
38 | 40 |
| 41 // Overridden from DateFormatObserver. |
| 42 virtual void OnDateFormatChanged() OVERRIDE; |
| 43 |
39 scoped_ptr<tray::DateView> date_; | 44 scoped_ptr<tray::DateView> date_; |
40 scoped_ptr<tray::DateView> date_tray_; | 45 scoped_ptr<tray::DateView> date_tray_; |
41 | 46 |
42 scoped_ptr<tray::PowerPopupView> power_; | 47 scoped_ptr<tray::PowerPopupView> power_; |
43 scoped_ptr<tray::PowerTrayView> power_tray_; | 48 scoped_ptr<tray::PowerTrayView> power_tray_; |
44 | 49 |
45 DISALLOW_COPY_AND_ASSIGN(TrayPowerDate); | 50 DISALLOW_COPY_AND_ASSIGN(TrayPowerDate); |
46 }; | 51 }; |
47 | 52 |
48 } // namespace internal | 53 } // namespace internal |
49 } // namespace ash | 54 } // namespace ash |
50 | 55 |
51 #endif // ASH_SYSTEM_POWER_TRAY_POWER_DATE_H_ | 56 #endif // ASH_SYSTEM_POWER_TRAY_POWER_DATE_H_ |
OLD | NEW |