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" |
11 #include "chrome/browser/chromeos/login/users/user_manager.h" | 11 #include "chrome/browser/chromeos/login/users/user_manager.h" |
12 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 12 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
13 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 13 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "components/signin/core/common/profile_management_switches.h" |
16 | 17 |
17 // static | 18 // static |
18 ProfileList* ProfileList::Create(ProfileInfoInterface* profile_cache) { | 19 ProfileList* ProfileList::Create(ProfileInfoInterface* profile_cache) { |
19 return new chromeos::ProfileListChromeOS(profile_cache); | 20 return new chromeos::ProfileListChromeOS(profile_cache); |
20 } | 21 } |
21 | 22 |
22 namespace chromeos { | 23 namespace chromeos { |
23 | 24 |
24 ProfileListChromeOS::ProfileListChromeOS(ProfileInfoInterface* profile_cache) | 25 ProfileListChromeOS::ProfileListChromeOS(ProfileInfoInterface* profile_cache) |
25 : profile_info_(profile_cache) { | 26 : profile_info_(profile_cache) { |
(...skipping 18 matching lines...) Expand all Loading... |
44 // Filter for profiles associated with logged-in users. | 45 // Filter for profiles associated with logged-in users. |
45 UserList users = UserManager::Get()->GetLoggedInUsers(); | 46 UserList users = UserManager::Get()->GetLoggedInUsers(); |
46 | 47 |
47 // Add corresponding profiles. | 48 // Add corresponding profiles. |
48 for (UserList::const_iterator it = users.begin(); | 49 for (UserList::const_iterator it = users.begin(); |
49 it != users.end(); ++it) { | 50 it != users.end(); ++it) { |
50 size_t i = profile_info_->GetIndexOfProfileWithPath( | 51 size_t i = profile_info_->GetIndexOfProfileWithPath( |
51 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); | 52 ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); |
52 | 53 |
53 gfx::Image icon = gfx::Image((*it)->GetImage()); | 54 gfx::Image icon = gfx::Image((*it)->GetImage()); |
54 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 55 if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) { |
55 switches::kNewProfileManagement) && !icon.IsEmpty()) { | |
56 // old avatar menu uses resized-small images | 56 // old avatar menu uses resized-small images |
57 icon = profiles::GetAvatarIconForMenu(icon, true); | 57 icon = profiles::GetAvatarIconForMenu(icon, true); |
58 } | 58 } |
59 | 59 |
60 AvatarMenu::Item* item = new AvatarMenu::Item(i, i, icon); | 60 AvatarMenu::Item* item = new AvatarMenu::Item(i, i, icon); |
61 item->name = (*it)->GetDisplayName(); | 61 item->name = (*it)->GetDisplayName(); |
62 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); | 62 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); |
63 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); | 63 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); |
64 item->supervised = false; | 64 item->supervised = false; |
65 item->signed_in = true; | 65 item->signed_in = true; |
(...skipping 32 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 |