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 #include "ash/system/date/tray_date.h" | 5 #include "ash/system/date/tray_date.h" |
6 | 6 |
| 7 #include "ash/common/wm/shelf/wm_shelf_util.h" |
7 #include "ash/shelf/shelf_util.h" | 8 #include "ash/shelf/shelf_util.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/system/date/date_default_view.h" | 10 #include "ash/system/date/date_default_view.h" |
10 #include "ash/system/date/date_view.h" | 11 #include "ash/system/date/date_view.h" |
11 #include "ash/system/tray/system_tray.h" | 12 #include "ash/system/tray/system_tray.h" |
12 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
13 #include "ash/system/tray/tray_item_view.h" | 14 #include "ash/system/tray/tray_item_view.h" |
14 #include "ash/wm/common/shelf/wm_shelf_util.h" | |
15 | 15 |
16 #if defined(OS_CHROMEOS) | 16 #if defined(OS_CHROMEOS) |
17 #include "ash/system/chromeos/system_clock_observer.h" | 17 #include "ash/system/chromeos/system_clock_observer.h" |
18 #endif | 18 #endif |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 | 21 |
22 TrayDate::TrayDate(SystemTray* system_tray) | 22 TrayDate::TrayDate(SystemTray* system_tray) |
23 : SystemTrayItem(system_tray), | 23 : SystemTrayItem(system_tray), |
24 time_tray_(NULL), | 24 time_tray_(NULL), |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 can_set_time ? TrayDate::SET_SYSTEM_TIME : TrayDate::NONE); | 125 can_set_time ? TrayDate::SET_SYSTEM_TIME : TrayDate::NONE); |
126 } | 126 } |
127 } | 127 } |
128 | 128 |
129 void TrayDate::Refresh() { | 129 void TrayDate::Refresh() { |
130 if (time_tray_) | 130 if (time_tray_) |
131 time_tray_->UpdateText(); | 131 time_tray_->UpdateText(); |
132 } | 132 } |
133 | 133 |
134 } // namespace ash | 134 } // namespace ash |
OLD | NEW |