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/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <climits> | 8 #include <climits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
606 | 606 |
607 void TrayUser::DestroyDetailedView() { | 607 void TrayUser::DestroyDetailedView() { |
608 } | 608 } |
609 | 609 |
610 void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) { | 610 void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) { |
611 switch (status) { | 611 switch (status) { |
612 case user::LOGGED_IN_LOCKED: | 612 case user::LOGGED_IN_LOCKED: |
613 case user::LOGGED_IN_USER: | 613 case user::LOGGED_IN_USER: |
614 case user::LOGGED_IN_OWNER: | 614 case user::LOGGED_IN_OWNER: |
615 case user::LOGGED_IN_PUBLIC: | 615 case user::LOGGED_IN_PUBLIC: |
616 case user::LOGGED_IN_LOCALLY_MANAGED: | |
bartfab (slow)
2013/04/05 13:16:33
Please restore this. Locally managed mode is in fl
stevenjb
2013/04/05 18:17:15
Done.
| |
617 avatar_->SetImage( | 616 avatar_->SetImage( |
618 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), | 617 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), |
619 gfx::Size(kUserIconSize, kUserIconSize)); | 618 gfx::Size(kUserIconSize, kUserIconSize)); |
620 avatar_->SetVisible(true); | 619 avatar_->SetVisible(true); |
621 break; | 620 break; |
622 | 621 |
623 case user::LOGGED_IN_GUEST: | 622 case user::LOGGED_IN_GUEST: |
624 label_->SetVisible(true); | 623 label_->SetVisible(true); |
625 break; | 624 break; |
626 | 625 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
662 // Check for null to avoid crbug.com/150944. | 661 // Check for null to avoid crbug.com/150944. |
663 if (avatar_) { | 662 if (avatar_) { |
664 avatar_->SetImage( | 663 avatar_->SetImage( |
665 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), | 664 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), |
666 gfx::Size(kUserIconSize, kUserIconSize)); | 665 gfx::Size(kUserIconSize, kUserIconSize)); |
667 } | 666 } |
668 } | 667 } |
669 | 668 |
670 } // namespace internal | 669 } // namespace internal |
671 } // namespace ash | 670 } // namespace ash |
OLD | NEW |