| 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_COMMON_SYSTEM_DATE_TRAY_DATE_H_ |
| 6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ | 6 #define ASH_COMMON_SYSTEM_DATE_TRAY_DATE_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/common/login_status.h" | 11 #include "ash/common/login_status.h" |
| 12 #include "ash/common/system/date/clock_observer.h" | 12 #include "ash/common/system/date/clock_observer.h" |
| 13 #include "ash/common/system/tray/system_tray_item.h" | 13 #include "ash/common/system/tray/system_tray_item.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 #if defined(OS_CHROMEOS) | 77 #if defined(OS_CHROMEOS) |
| 78 std::unique_ptr<SystemClockObserver> system_clock_observer_; | 78 std::unique_ptr<SystemClockObserver> system_clock_observer_; |
| 79 #endif | 79 #endif |
| 80 | 80 |
| 81 DISALLOW_COPY_AND_ASSIGN(TrayDate); | 81 DISALLOW_COPY_AND_ASSIGN(TrayDate); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace ash | 84 } // namespace ash |
| 85 | 85 |
| 86 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ | 86 #endif // ASH_COMMON_SYSTEM_DATE_TRAY_DATE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2061123004:
mash: Move //ash/system/date to //ash/common (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@uma