Move User Manager onto a System profile.

chrome/browser/profiles/profile_window.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/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 156 matching lines @@
   // Passing true for |always_create| means we won't duplicate the code that
   // tries to find a browser.
   profiles::FindOrCreateNewWindowForProfile(
       profile,
       is_process_startup,
       is_first_run,
       desktop_type,
       true);
 }
 
-// Called after a |guest_profile| is available to be used by the user manager.
+// Called after a |system_profile| is available to be used by the user manager.
 // Based on the value of |tutorial_mode| we determine a url to be displayed
 // by the webui and run the |callback|, if it exists. After opening a profile,
 // perform |profile_open_action|.
-void OnUserManagerGuestProfileCreated(
+void OnUserManagerSystemProfileCreated(
     const base::FilePath& profile_path_to_focus,
     profiles::UserManagerTutorialMode tutorial_mode,
     profiles::UserManagerProfileSelected profile_open_action,
     const base::Callback<void(Profile*, const std::string&)>& callback,
-    Profile* guest_profile,
+    Profile* system_profile,
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED || callback.is_null())
     return;
 
   // Tell the webui which user should be focused.
   std::string page = chrome::kChromeUIUserManagerURL;
 
   if (tutorial_mode == profiles::USER_MANAGER_TUTORIAL_OVERVIEW) {
     page += profiles::kUserManagerDisplayTutorial;
   } else if (!profile_path_to_focus.empty()) {
@@ skipping 10 matching lines @@
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME) {
     page += profiles::kUserManagerSelectProfileAboutChrome;
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS) {
     page += profiles::kUserManagerSelectProfileChromeSettings;
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY) {
     page += profiles::kUserManagerSelectProfileChromeMemory;
   }
-  callback.Run(guest_profile, page);
+  callback.Run(system_profile, page);
 }
 
 // Updates Chrome services that require notification when
 // the new_profile_management's status changes.
 void UpdateServicesWithNewProfileManagementFlag(Profile* profile,
                                                 bool new_flag_status) {
   AccountReconcilor* account_reconcilor =
       AccountReconcilorFactory::GetForProfile(profile);
   account_reconcilor->OnNewProfileManagementFlagChanged(new_flag_status);
 }
@@ skipping 161 matching lines @@
     return false;
   }
 
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (cache.ProfileIsSupervisedAtIndex(i))
       return true;
   }
   return false;
 }
 
-void CreateGuestProfileForUserManager(
+void CreateSystemProfileForUserManager(
     const base::FilePath& profile_path_to_focus,
     profiles::UserManagerTutorialMode tutorial_mode,
     profiles::UserManagerProfileSelected profile_open_action,
     const base::Callback<void(Profile*, const std::string&)>& callback) {
-  // Create the guest profile, if necessary, and open the User Manager
-  // from the guest profile.
+  // Create the system profile, if necessary, and open the User Manager
+  // from the system profile.
   g_browser_process->profile_manager()->CreateProfileAsync(
-      ProfileManager::GetGuestProfilePath(),
-      base::Bind(&OnUserManagerGuestProfileCreated,
+      ProfileManager::GetSystemProfilePath(),
+      base::Bind(&OnUserManagerSystemProfileCreated,
                  profile_path_to_focus,
                  tutorial_mode,
                  profile_open_action,
                  callback),
       base::string16(),
       base::string16(),
       std::string());
 }
 
 void ShowUserManagerMaybeWithTutorial(Profile* profile) {
@@ skipping 80 matching lines @@
     case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR:
       *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
       *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR;
       return;
     default:
       *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
 }
 
 }  // namespace profiles