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/status_area_widget.h" | 5 #include "ash/system/status_area_widget.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_delegate.h" | 9 #include "ash/shell_delegate.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 virtual const std::string GetUserEmail() const OVERRIDE { | 81 virtual const std::string GetUserEmail() const OVERRIDE { |
82 return "über@tray"; | 82 return "über@tray"; |
83 } | 83 } |
84 | 84 |
85 virtual const gfx::ImageSkia& GetUserImage() const OVERRIDE { | 85 virtual const gfx::ImageSkia& GetUserImage() const OVERRIDE { |
86 return null_image_; | 86 return null_image_; |
87 } | 87 } |
88 | 88 |
89 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { | 89 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE { |
90 return user::LOGGED_IN_USER; | 90 return Shell::GetInstance()->IsScreenLocked() ? user::LOGGED_IN_LOCKED : |
| 91 user::LOGGED_IN_USER; |
91 } | 92 } |
92 | 93 |
93 virtual bool SystemShouldUpgrade() const OVERRIDE { | 94 virtual bool SystemShouldUpgrade() const OVERRIDE { |
94 return true; | 95 return true; |
95 } | 96 } |
96 | 97 |
97 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 98 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
98 return base::k24HourClock; | 99 return base::k24HourClock; |
99 } | 100 } |
100 | 101 |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 return; | 422 return; |
422 login_status_ = login_status; | 423 login_status_ = login_status; |
423 if (system_tray_) | 424 if (system_tray_) |
424 system_tray_->UpdateAfterLoginStatusChange(login_status); | 425 system_tray_->UpdateAfterLoginStatusChange(login_status); |
425 if (web_notification_tray_) | 426 if (web_notification_tray_) |
426 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 427 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
427 } | 428 } |
428 | 429 |
429 } // namespace internal | 430 } // namespace internal |
430 } // namespace ash | 431 } // namespace ash |
OLD | NEW |