| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 54 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 55 switches::kNewProfileManagement) && !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->managed = false; | 64 item->supervised = false; |
| 65 item->signed_in = true; | 65 item->signed_in = true; |
| 66 item->active = profile_info_->GetPathOfProfileAtIndex(i) == | 66 item->active = profile_info_->GetPathOfProfileAtIndex(i) == |
| 67 active_profile_path_; | 67 active_profile_path_; |
| 68 item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i); | 68 item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i); |
| 69 items_.push_back(item); | 69 items_.push_back(item); |
| 70 } | 70 } |
| 71 | 71 |
| 72 SortMenu(); | 72 SortMenu(); |
| 73 | 73 |
| 74 // After sorting, assign items their actual indices. | 74 // After sorting, assign items their actual indices. |
| (...skipping 23 matching lines...) Expand all 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 |