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

Unified Diff: chrome/browser/ui/webui/options/managed_user_import_handler.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/managed_user_import_handler.cc
diff --git a/chrome/browser/ui/webui/options/managed_user_import_handler.cc b/chrome/browser/ui/webui/options/managed_user_import_handler.cc
index c19021b0f282d69af3146cdc941ad94560b5ed96..34064e2ccfd77dcad4878c8dc7aff9f09447f429 100644
--- a/chrome/browser/ui/webui/options/managed_user_import_handler.cc
+++ b/chrome/browser/ui/webui/options/managed_user_import_handler.cc
@@ -53,7 +53,7 @@ ManagedUserImportHandler::ManagedUserImportHandler()
ManagedUserImportHandler::~ManagedUserImportHandler() {
Profile* profile = Profile::FromWebUI(web_ui());
- if (!profile->IsManaged()) {
+ if (!profile->IsSupervised()) {
ManagedUserSyncService* service =
ManagedUserSyncServiceFactory::GetForProfile(profile);
if (service)
@@ -86,7 +86,7 @@ void ManagedUserImportHandler::GetLocalizedValues(
void ManagedUserImportHandler::InitializeHandler() {
Profile* profile = Profile::FromWebUI(web_ui());
- if (!profile->IsManaged()) {
+ if (!profile->IsSupervised()) {
ManagedUserSyncService* sync_service =
ManagedUserSyncServiceFactory::GetForProfile(profile);
if (sync_service) {
@@ -124,7 +124,7 @@ void ManagedUserImportHandler::FetchManagedUsers() {
void ManagedUserImportHandler::RequestManagedUserImportUpdate(
const base::ListValue* /* args */) {
- if (Profile::FromWebUI(web_ui())->IsManaged())
+ if (Profile::FromWebUI(web_ui())->IsSupervised())
return;
if (!IsAccountConnected() || HasAuthError()) {
@@ -150,8 +150,8 @@ void ManagedUserImportHandler::SendExistingManagedUsers(
// Collect the ids of local supervised user profiles.
std::set<std::string> managed_user_ids;
for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
- if (cache.ProfileIsManagedAtIndex(i))
- managed_user_ids.insert(cache.GetManagedUserIdOfProfileAtIndex(i));
+ if (cache.ProfileIsSupervisedAtIndex(i))
+ managed_user_ids.insert(cache.GetSupervisedUserIdOfProfileAtIndex(i));
}
base::ListValue managed_users;
« no previous file with comments | « chrome/browser/ui/webui/options/manage_profile_handler.cc ('k') | chrome/browser/ui/webui/options/options_handlers_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698