| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_COMMON_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ | 5 #ifndef ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ | 
| 6 #define ASH_COMMON_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ | 6 #define ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_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/login_status.h" | 
| 12 #include "ash/common/system/date/clock_observer.h" | 12 #include "ash/system/date/clock_observer.h" | 
| 13 #include "ash/common/system/tray/system_tray_item.h" | 13 #include "ash/system/tray/system_tray_item.h" | 
| 14 #include "base/macros.h" | 14 #include "base/macros.h" | 
| 15 | 15 | 
| 16 namespace views { | 16 namespace views { | 
| 17 class Label; | 17 class Label; | 
| 18 } | 18 } | 
| 19 | 19 | 
| 20 namespace ash { | 20 namespace ash { | 
| 21 class SystemClockObserver; | 21 class SystemClockObserver; | 
| 22 class SystemInfoDefaultView; | 22 class SystemInfoDefaultView; | 
| 23 | 23 | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 57   SystemInfoDefaultView* default_view_; | 57   SystemInfoDefaultView* default_view_; | 
| 58   LoginStatus login_status_; | 58   LoginStatus login_status_; | 
| 59 | 59 | 
| 60   std::unique_ptr<SystemClockObserver> system_clock_observer_; | 60   std::unique_ptr<SystemClockObserver> system_clock_observer_; | 
| 61 | 61 | 
| 62   DISALLOW_COPY_AND_ASSIGN(TraySystemInfo); | 62   DISALLOW_COPY_AND_ASSIGN(TraySystemInfo); | 
| 63 }; | 63 }; | 
| 64 | 64 | 
| 65 }  // namespace ash | 65 }  // namespace ash | 
| 66 | 66 | 
| 67 #endif  // ASH_COMMON_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ | 67 #endif  // ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ | 
| OLD | NEW | 
|---|