| 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/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 | 13 |
| 13 namespace views { | 14 namespace views { |
| 14 class Label; | 15 class Label; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace ash { | 18 namespace ash { |
| 18 class DateDefaultView; | 19 class DateDefaultView; |
| 19 #if defined(OS_CHROMEOS) | 20 #if defined(OS_CHROMEOS) |
| 20 class SystemClockObserver; | 21 class SystemClockObserver; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #if defined(OS_CHROMEOS) | 74 #if defined(OS_CHROMEOS) |
| 74 scoped_ptr<SystemClockObserver> system_clock_observer_; | 75 scoped_ptr<SystemClockObserver> system_clock_observer_; |
| 75 #endif | 76 #endif |
| 76 | 77 |
| 77 DISALLOW_COPY_AND_ASSIGN(TrayDate); | 78 DISALLOW_COPY_AND_ASSIGN(TrayDate); |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 } // namespace ash | 81 } // namespace ash |
| 81 | 82 |
| 82 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ | 83 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ |
| OLD | NEW |