Move User Manager onto a System profile.

chrome/browser/ui/views/profiles/user_manager_view.cc

 // Copyright 2014 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/views/profiles/user_manager_view.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 43 matching lines @@
   if (instance_) {
     // If we are showing the User Manager after locking a profile, change the
     // active profile to Guest.
     profiles::SetActiveProfileToGuestIfLocked();
 
     // If there's a user manager window open already, just activate it.
     instance_->GetWidget()->Activate();
     return;
   }
 
-  // Create the guest profile, if necessary, and open the user manager
-  // from the guest profile.
-  profiles::CreateGuestProfileForUserManager(
+  // Create the system profile, if necessary, and open the user manager
+  // from the system profile.
+  profiles::CreateSystemProfileForUserManager(
       profile_path_to_focus,
       tutorial_mode,
       profile_open_action,
-      base::Bind(&UserManagerView::OnGuestProfileCreated,
+      base::Bind(&UserManagerView::OnSystemProfileCreated,
                  base::Passed(make_scoped_ptr(new UserManagerView))));
 }
 
 void UserManager::Hide() {
   if (instance_)
     instance_->GetWidget()->Close();
 }
 
 bool UserManager::IsShowing() {
   return instance_ ? instance_->GetWidget()->IsActive() : false;
 }
 
 // UserManagerView -------------------------------------------------------------
 
 UserManagerView::UserManagerView()
     : web_view_(NULL),
       keep_alive_(new AutoKeepAlive(NULL)) {
 }
 
 UserManagerView::~UserManagerView() {
 }
 
 // static
-void UserManagerView::OnGuestProfileCreated(
+void UserManagerView::OnSystemProfileCreated(
     scoped_ptr<UserManagerView> instance,
-    Profile* guest_profile,
+    Profile* system_profile,
     const std::string& url) {
   // If we are showing the User Manager after locking a profile, change the
   // active profile to Guest.
   profiles::SetActiveProfileToGuestIfLocked();
 
   DCHECK(!instance_);
   instance_ = instance.release();  // |instance_| takes over ownership.
-  instance_->Init(guest_profile, GURL(url));
+  instance_->Init(system_profile, GURL(url));
 }
 
-void UserManagerView::Init(Profile* guest_profile, const GURL& url) {
-  web_view_ = new views::WebView(guest_profile);
+void UserManagerView::Init(Profile* system_profile, const GURL& url) {
+  web_view_ = new views::WebView(system_profile);
   web_view_->set_allow_accelerators(true);
   AddChildView(web_view_);
   SetLayoutManager(new views::FillLayout);
   AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
   AddAccelerator(ui::Accelerator(ui::VKEY_F4, ui::EF_ALT_DOWN));
 
   // If the user manager is being displayed from an existing profile, use
   // its last active browser to determine where the user manager should be
   // placed.  This is used so that we can center the dialog on the correct
   // monitor in a multiple-monitor setup.
@@ skipping 23 matching lines @@
   // Since the User Manager can be the only top level window, we don't
   // want to accidentally quit all of Chrome if the user is just trying to
   // unfocus the selected pod in the WebView.
   GetDialogClientView()->RemoveAccelerator(
       ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 
 #if defined(OS_WIN)
   // Set the app id for the task manager to the app id of its parent
   ui::win::SetAppIdForWindow(
       ShellIntegration::GetChromiumModelIdForProfile(
-          guest_profile->GetPath()),
+          system_profile->GetPath()),
       views::HWNDForWidget(GetWidget()));
 #endif
 
   web_view_->LoadInitialURL(url);
   content::RenderWidgetHostView* rwhv =
       web_view_->GetWebContents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetBackgroundColor(profiles::kUserManagerBackgroundColor);
 
   web_view_->RequestFocus();
@@ skipping 38 matching lines @@
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool UserManagerView::UseNewStyleForThisDialog() const {
   return false;
 }