| 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 #include "ash/system/date/tray_system_info.h" | 5 #include "ash/system/date/tray_system_info.h" |
| 6 | 6 |
| 7 #include "ash/common/wm_shell.h" | |
| 8 #include "ash/shelf/wm_shelf_util.h" | 7 #include "ash/shelf/wm_shelf_util.h" |
| 9 #include "ash/system/date/date_view.h" | 8 #include "ash/system/date/date_view.h" |
| 10 #include "ash/system/date/system_info_default_view.h" | 9 #include "ash/system/date/system_info_default_view.h" |
| 11 #include "ash/system/system_clock_observer.h" | 10 #include "ash/system/system_clock_observer.h" |
| 12 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
| 13 #include "ash/system/tray/system_tray_notifier.h" | 12 #include "ash/system/tray/system_tray_notifier.h" |
| 14 #include "ash/system/tray/tray_item_view.h" | 13 #include "ash/system/tray/tray_item_view.h" |
| 14 #include "ash/wm_shell.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 TraySystemInfo::TraySystemInfo(SystemTray* system_tray) | 18 TraySystemInfo::TraySystemInfo(SystemTray* system_tray) |
| 19 : SystemTrayItem(system_tray, UMA_DATE), | 19 : SystemTrayItem(system_tray, UMA_DATE), |
| 20 tray_view_(nullptr), | 20 tray_view_(nullptr), |
| 21 default_view_(nullptr), | 21 default_view_(nullptr), |
| 22 login_status_(LoginStatus::NOT_LOGGED_IN), | 22 login_status_(LoginStatus::NOT_LOGGED_IN), |
| 23 system_clock_observer_(new SystemClockObserver()) { | 23 system_clock_observer_(new SystemClockObserver()) { |
| 24 WmShell::Get()->system_tray_notifier()->AddClockObserver(this); | 24 WmShell::Get()->system_tray_notifier()->AddClockObserver(this); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 void TraySystemInfo::UpdateTimeFormat() { | 106 void TraySystemInfo::UpdateTimeFormat() { |
| 107 if (tray_view_) | 107 if (tray_view_) |
| 108 tray_view_->UpdateTimeFormat(); | 108 tray_view_->UpdateTimeFormat(); |
| 109 if (default_view_) | 109 if (default_view_) |
| 110 default_view_->GetDateView()->UpdateTimeFormat(); | 110 default_view_->GetDateView()->UpdateTimeFormat(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace ash | 113 } // namespace ash |
| OLD | NEW |