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/profiles/profile_list_desktop.h" | 5 #include "chrome/browser/profiles/profile_list_desktop.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 8 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
9 #include "chrome/browser/profiles/profile_info_cache.h" | 9 #include "chrome/browser/profiles/profile_info_cache.h" |
10 #include "components/signin/core/common/profile_management_switches.h" | 10 #include "components/signin/core/common/profile_management_switches.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 continue; | 44 continue; |
45 } | 45 } |
46 | 46 |
47 gfx::Image icon = profile_info_->GetAvatarIconOfProfileAtIndex(i); | 47 gfx::Image icon = profile_info_->GetAvatarIconOfProfileAtIndex(i); |
48 AvatarMenu::Item* item = new AvatarMenu::Item(i - omitted_item_count_, | 48 AvatarMenu::Item* item = new AvatarMenu::Item(i - omitted_item_count_, |
49 i, | 49 i, |
50 icon); | 50 icon); |
51 item->name = profile_info_->GetNameOfProfileAtIndex(i); | 51 item->name = profile_info_->GetNameOfProfileAtIndex(i); |
52 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); | 52 item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i); |
53 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); | 53 item->profile_path = profile_info_->GetPathOfProfileAtIndex(i); |
54 item->managed = profile_info_->ProfileIsManagedAtIndex(i); | 54 item->supervised = profile_info_->ProfileIsSupervisedAtIndex(i); |
55 item->signed_in = !item->sync_state.empty(); | 55 item->signed_in = !item->sync_state.empty(); |
56 if (!item->signed_in) { | 56 if (!item->signed_in) { |
57 item->sync_state = l10n_util::GetStringUTF16( | 57 item->sync_state = l10n_util::GetStringUTF16( |
58 item->managed ? IDS_MANAGED_USER_AVATAR_LABEL : | 58 item->supervised ? IDS_MANAGED_USER_AVATAR_LABEL : |
59 IDS_PROFILES_LOCAL_PROFILE_STATE); | 59 IDS_PROFILES_LOCAL_PROFILE_STATE); |
60 } | 60 } |
61 item->active = profile_info_->GetPathOfProfileAtIndex(i) == | 61 item->active = profile_info_->GetPathOfProfileAtIndex(i) == |
62 active_profile_path_; | 62 active_profile_path_; |
63 item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i); | 63 item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i); |
64 items_.push_back(item); | 64 items_.push_back(item); |
65 } | 65 } |
66 // One omitted item is expected when a supervised-user profile is in the | 66 // One omitted item is expected when a supervised-user profile is in the |
67 // process of being registered, but there shouldn't be more than one. | 67 // process of being registered, but there shouldn't be more than one. |
68 VLOG_IF(2, (omitted_item_count_ > 1)) << omitted_item_count_ | 68 VLOG_IF(2, (omitted_item_count_ > 1)) << omitted_item_count_ |
69 << " profiles omitted fom list."; | 69 << " profiles omitted fom list."; |
(...skipping 20 matching lines...) Expand all Loading... |
90 } | 90 } |
91 | 91 |
92 void ProfileListDesktop::ActiveProfilePathChanged(base::FilePath& path) { | 92 void ProfileListDesktop::ActiveProfilePathChanged(base::FilePath& path) { |
93 active_profile_path_ = path; | 93 active_profile_path_ = path; |
94 } | 94 } |
95 | 95 |
96 void ProfileListDesktop::ClearMenu() { | 96 void ProfileListDesktop::ClearMenu() { |
97 STLDeleteElements(&items_); | 97 STLDeleteElements(&items_); |
98 omitted_item_count_ = 0; | 98 omitted_item_count_ = 0; |
99 } | 99 } |
OLD | NEW |