| 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 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 const AvatarMenu::Item& ProfileListChromeOS::GetItemAt(size_t index) const { | 37 const AvatarMenu::Item& ProfileListChromeOS::GetItemAt(size_t index) const { |
| 38 DCHECK_LT(index, items_.size()); | 38 DCHECK_LT(index, items_.size()); |
| 39 return *items_[index]; | 39 return *items_[index]; |
| 40 } | 40 } |
| 41 | 41 |
| 42 void ProfileListChromeOS::RebuildMenu() { | 42 void ProfileListChromeOS::RebuildMenu() { |
| 43 ClearMenu(); | 43 ClearMenu(); |
| 44 | 44 |
| 45 // Filter for profiles associated with logged-in users. | 45 // Filter for profiles associated with logged-in users. |
| 46 UserList users = UserManager::Get()->GetLoggedInUsers(); | 46 UserList users = GetUserManager()->GetLoggedInUsers(); |
| 47 | 47 |
| 48 // Add corresponding profiles. | 48 // Add corresponding profiles. |
| 49 for (UserList::const_iterator it = users.begin(); | 49 for (UserList::const_iterator it = users.begin(); |
| 50 it != users.end(); ++it) { | 50 it != users.end(); ++it) { |
| 51 size_t i = profile_info_->GetIndexOfProfileWithPath( | 51 size_t i = profile_info_->GetIndexOfProfileWithPath( |
| 52 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); | 52 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); |
| 53 | 53 |
| 54 gfx::Image icon = gfx::Image((*it)->GetImage()); | 54 gfx::Image icon = gfx::Image((*it)->GetImage()); |
| 55 if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) { | 55 if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) { |
| 56 // old avatar menu uses resized-small images | 56 // old avatar menu uses resized-small images |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 void ProfileListChromeOS::ClearMenu() { | 98 void ProfileListChromeOS::ClearMenu() { |
| 99 STLDeleteElements(&items_); | 99 STLDeleteElements(&items_); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void ProfileListChromeOS::SortMenu() { | 102 void ProfileListChromeOS::SortMenu() { |
| 103 // Sort list of items by name. | 103 // Sort list of items by name. |
| 104 std::sort(items_.begin(), items_.end(), &AvatarMenu::CompareItems); | 104 std::sort(items_.begin(), items_.end(), &AvatarMenu::CompareItems); |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // namespace chromeos | 107 } // namespace chromeos |
| OLD | NEW |