| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/chromeos/profiles/profile_list_chromeos.h" | 5 #include "chrome/browser/chromeos/profiles/profile_list_chromeos.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 user_manager::UserList users = UserManager::Get()->GetLoggedInUsers(); | 46 user_manager::UserList users = UserManager::Get()->GetLoggedInUsers(); |
| 47 | 47 |
| 48 // Add corresponding profiles. | 48 // Add corresponding profiles. |
| 49 for (user_manager::UserList::const_iterator it = users.begin(); | 49 for (user_manager::UserList::const_iterator it = users.begin(); |
| 50 it != users.end(); | 50 it != users.end(); |
| 51 ++it) { | 51 ++it) { |
| 52 size_t i = profile_info_->GetIndexOfProfileWithPath( | 52 size_t i = profile_info_->GetIndexOfProfileWithPath( |
| 53 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); | 53 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); |
| 54 | 54 |
| 55 gfx::Image icon = gfx::Image((*it)->GetImage()); | 55 gfx::Image icon = gfx::Image((*it)->GetImage()); |
| 56 if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) { | 56 if (!switches::IsEnableAccountConsistency() && !icon.IsEmpty()) { |
| 57 // old avatar menu uses resized-small images | 57 // old avatar menu uses resized-small images |
| 58 icon = profiles::GetAvatarIconForMenu(icon, true); | 58 icon = profiles::GetAvatarIconForMenu(icon, true); |
| 59 } | 59 } |
| 60 | 60 |
| 61 AvatarMenu::Item* item = new AvatarMenu::Item(i, i, icon); | 61 AvatarMenu::Item* item = new AvatarMenu::Item(i, i, icon); |
| 62 item->name = (*it)->GetDisplayName(); | 62 item->name = (*it)->GetDisplayName(); |
| 63 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); | 63 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); |
| 64 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); | 64 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); |
| 65 item->supervised = false; | 65 item->supervised = false; |
| 66 item->signed_in = true; | 66 item->signed_in = true; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 void ProfileListChromeOS::ClearMenu() { | 99 void ProfileListChromeOS::ClearMenu() { |
| 100 STLDeleteElements(&items_); | 100 STLDeleteElements(&items_); |
| 101 } | 101 } |
| 102 | 102 |
| 103 void ProfileListChromeOS::SortMenu() { | 103 void ProfileListChromeOS::SortMenu() { |
| 104 // Sort list of items by name. | 104 // Sort list of items by name. |
| 105 std::sort(items_.begin(), items_.end(), &AvatarMenu::CompareItems); | 105 std::sort(items_.begin(), items_.end(), &AvatarMenu::CompareItems); |
| 106 } | 106 } |
| 107 | 107 |
| 108 } // namespace chromeos | 108 } // namespace chromeos |
| OLD | NEW |