Rename "managed (mode|user)" to "supervised user" (part 1)

chrome/browser/ui/app_list/app_list_service_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
 
 #include <string>
 
 #include "apps/pref_names.h"
 #include "base/bind.h"
@@ skipping 112 matching lines @@
   }
 
   virtual Profile* GetProfileByPath(const base::FilePath& path) OVERRIDE {
     return profile_manager_->GetProfileByPath(path);
   }
 
   virtual base::FilePath GetUserDataDir() OVERRIDE {
     return profile_manager_->user_data_dir();
   }
 
-  virtual bool IsProfileManaged(const base::FilePath& profile_path) OVERRIDE {
+  virtual bool IsProfileSupervised(
+      const base::FilePath& profile_path) OVERRIDE {
     ProfileInfoCache& profile_info =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t profile_index = profile_info.GetIndexOfProfileWithPath(profile_path);
     return profile_index != std::string::npos &&
-        profile_info.ProfileIsManagedAtIndex(profile_index);
+        profile_info.ProfileIsSupervisedAtIndex(profile_index);
   }
 
  private:
   ProfileManager* profile_manager_;
   base::WeakPtrFactory<ProfileStoreImpl> weak_factory_;
 };
 
 void RecordAppListDiscoverability(PrefService* local_state,
                                   bool is_startup_check) {
   // Since this task may be delayed, ensure it does not interfere with shutdown
@@ skipping 120 matching lines @@
   }
 
   // If there is no last used profile recorded, use the initial profile.
   if (app_list_profile.empty())
     app_list_profile = chrome::kInitialProfile;
 
   return user_data_dir.AppendASCII(app_list_profile);
 }
 
 void AppListServiceImpl::SetProfilePath(const base::FilePath& profile_path) {
-  // Ensure we don't set the pref to a managed user's profile path.
-  // TODO(calamity): Filter out managed profiles from the settings app so this
-  // can't get hit, so we can remove it.
-  if (profile_store_->IsProfileManaged(profile_path))
+  // Ensure we don't set the pref to a supervised user's profile path.
+  // TODO(calamity): Filter out supervised profiles from the settings app so
+  // this can't get hit, so we can remove it.
+  if (profile_store_->IsProfileSupervised(profile_path))
     return;
 
   local_state_->SetString(
       prefs::kAppListProfile,
       profile_path.BaseName().MaybeAsASCII());
 }
 
 void AppListServiceImpl::CreateShortcut() {}
 
 // We need to watch for profile removal to keep kAppListProfile updated.
@@ skipping 72 matching lines @@
   if (!base::MessageLoop::current())
     return;  // In a unit test.
 
   // Send app list usage stats after a delay.
   const int kSendUsageStatsDelay = 5;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AppListServiceImpl::SendAppListStats),
       base::TimeDelta::FromSeconds(kSendUsageStatsDelay));
 }