| 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 "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/system/date/clock_observer.h" | 9 #include "ash/system/date/clock_observer.h" |
| 10 #include "ash/system/tray/system_tray_item.h" | 10 #include "ash/system/tray/system_tray_item.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 class Label; | 14 class Label; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 namespace internal { | 18 class DateDefaultView; |
| 19 | |
| 20 #if defined(OS_CHROMEOS) | 19 #if defined(OS_CHROMEOS) |
| 21 class SystemClockObserver; | 20 class SystemClockObserver; |
| 22 #endif | 21 #endif |
| 23 class DateDefaultView; | |
| 24 | 22 |
| 25 namespace tray { | 23 namespace tray { |
| 26 class TimeView; | 24 class TimeView; |
| 27 } | 25 } |
| 28 | 26 |
| 29 class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { | 27 class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { |
| 30 public: | 28 public: |
| 31 enum ClockLayout { | 29 enum ClockLayout { |
| 32 HORIZONTAL_CLOCK, | 30 HORIZONTAL_CLOCK, |
| 33 VERTICAL_CLOCK, | 31 VERTICAL_CLOCK, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 64 tray::TimeView* time_tray_; | 62 tray::TimeView* time_tray_; |
| 65 DateDefaultView* default_view_; | 63 DateDefaultView* default_view_; |
| 66 | 64 |
| 67 #if defined(OS_CHROMEOS) | 65 #if defined(OS_CHROMEOS) |
| 68 scoped_ptr<SystemClockObserver> system_clock_observer_; | 66 scoped_ptr<SystemClockObserver> system_clock_observer_; |
| 69 #endif | 67 #endif |
| 70 | 68 |
| 71 DISALLOW_COPY_AND_ASSIGN(TrayDate); | 69 DISALLOW_COPY_AND_ASSIGN(TrayDate); |
| 72 }; | 70 }; |
| 73 | 71 |
| 74 } // namespace internal | |
| 75 } // namespace ash | 72 } // namespace ash |
| 76 | 73 |
| 77 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ | 74 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ |
| OLD | NEW |