Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Side by Side Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 897903002: UserManager: set user.supervisedUser only for legacy supervised users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/webui/signin/user_manager_screen_handler.h" 5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/value_conversions.h" 10 #include "base/value_conversions.h"
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 kKeyUsername, info_cache.GetUserNameOfProfileAtIndex(i)); 721 kKeyUsername, info_cache.GetUserNameOfProfileAtIndex(i));
722 profile_value->SetString( 722 profile_value->SetString(
723 kKeyEmailAddress, info_cache.GetUserNameOfProfileAtIndex(i)); 723 kKeyEmailAddress, info_cache.GetUserNameOfProfileAtIndex(i));
724 profile_value->SetString( 724 profile_value->SetString(
725 kKeyDisplayName, 725 kKeyDisplayName,
726 profiles::GetAvatarNameForProfile(profile_path)); 726 profiles::GetAvatarNameForProfile(profile_path));
727 profile_value->Set( 727 profile_value->Set(
728 kKeyProfilePath, base::CreateFilePathValue(profile_path)); 728 kKeyProfilePath, base::CreateFilePathValue(profile_path));
729 profile_value->SetBoolean(kKeyPublicAccount, false); 729 profile_value->SetBoolean(kKeyPublicAccount, false);
730 profile_value->SetBoolean( 730 profile_value->SetBoolean(
731 kKeySupervisedUser, info_cache.ProfileIsSupervisedAtIndex(i)); 731 kKeySupervisedUser, info_cache.ProfileIsLegacySupervisedAtIndex(i));
Bernhard Bauer 2015/02/04 16:03:32 Hm... usually we use IsSupervised to mean both leg
merkulova 2015/02/04 16:26:37 Agree with Bernhard. There's clearly some ambigui
732 profile_value->SetBoolean( 732 profile_value->SetBoolean(
733 kKeyChildUser, info_cache.ProfileIsChildAtIndex(i)); 733 kKeyChildUser, info_cache.ProfileIsChildAtIndex(i));
734 profile_value->SetBoolean( 734 profile_value->SetBoolean(
735 kKeyNeedsSignin, info_cache.ProfileIsSigninRequiredAtIndex(i)); 735 kKeyNeedsSignin, info_cache.ProfileIsSigninRequiredAtIndex(i));
736 profile_value->SetBoolean(kKeyIsOwner, false); 736 profile_value->SetBoolean(kKeyIsOwner, false);
737 profile_value->SetBoolean(kKeyCanRemove, can_remove); 737 profile_value->SetBoolean(kKeyCanRemove, can_remove);
738 profile_value->SetBoolean(kKeyIsDesktop, true); 738 profile_value->SetBoolean(kKeyIsDesktop, true);
739 profile_value->SetString( 739 profile_value->SetString(
740 kKeyAvatarUrl, GetAvatarImageAtIndex(i, info_cache)); 740 kKeyAvatarUrl, GetAvatarImageAtIndex(i, info_cache));
741 741
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 Profile* profile, Profile::CreateStatus profile_create_status) { 828 Profile* profile, Profile::CreateStatus profile_create_status) {
829 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_); 829 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_);
830 if (browser && browser->window()) { 830 if (browser && browser->window()) {
831 OnBrowserWindowReady(browser); 831 OnBrowserWindowReady(browser);
832 } else { 832 } else {
833 registrar_.Add(this, 833 registrar_.Add(this,
834 chrome::NOTIFICATION_BROWSER_WINDOW_READY, 834 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
835 content::NotificationService::AllSources()); 835 content::NotificationService::AllSources());
836 } 836 }
837 } 837 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698