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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/date/date_view.h" | 8 #include "ash/system/date/date_view.h" |
9 #include "ash/system/tray/system_tray_delegate.h" | 9 #include "ash/system/tray/system_tray_delegate.h" |
10 #include "ash/system/tray/tray_constants.h" | 10 #include "ash/system/tray/tray_constants.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 void TrayDate::DestroyDefaultView() { | 70 void TrayDate::DestroyDefaultView() { |
71 } | 71 } |
72 | 72 |
73 void TrayDate::DestroyDetailedView() { | 73 void TrayDate::DestroyDetailedView() { |
74 } | 74 } |
75 | 75 |
76 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) { | 76 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) { |
77 } | 77 } |
78 | 78 |
79 void TrayDate::OnDateFormatChanged() { | 79 void TrayDate::OnDateFormatChanged() { |
| 80 if (!date_tray_.get()) |
| 81 return; |
| 82 |
80 date_tray_->UpdateTimeFormat(); | 83 date_tray_->UpdateTimeFormat(); |
81 } | 84 } |
82 | 85 |
83 void TrayDate::Refresh() { | 86 void TrayDate::Refresh() { |
84 date_tray_->UpdateText(); | 87 date_tray_->UpdateText(); |
85 } | 88 } |
86 | 89 |
87 } // namespace internal | 90 } // namespace internal |
88 } // namespace ash | 91 } // namespace ash |
OLD | NEW |