First try at a user management screen for the desktop

chrome/browser/profiles/avatar_menu_model.cc

 // Copyright (c) 2012 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/avatar_menu_model.h"
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 22 matching lines @@
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
-void OnProfileCreated(bool always_create,
-                      chrome::HostDesktopType desktop_type,
-                      Profile* profile,
-                      Profile::CreateStatus status) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (status == Profile::CREATE_STATUS_INITIALIZED) {
-    ProfileManager::FindOrCreateNewWindowForProfile(
-        profile,
-        chrome::startup::IS_NOT_PROCESS_STARTUP,
-        chrome::startup::IS_NOT_FIRST_RUN,
-        desktop_type,
-        always_create);
-  }
-}
-
 // Constants for the show profile switcher experiment
 const char kShowProfileSwitcherFieldTrialName[] = "ShowProfileSwitcher";
 const char kAlwaysShowSwitcherGroupName[] = "AlwaysShow";
 
 
 class SignoutTracker : public content::WebContentsObserver {
  public:
   SignoutTracker(Profile* profile, const GURL& signout_landing_url,
                  content::WebContents* contents);
 
@@ skipping 70 matching lines @@
   DCHECK(ProfileManager::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
   const Item& item = GetItemAt(index);
   base::FilePath path =
       profile_info_->GetPathOfProfileAtIndex(item.model_index);
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
-  g_browser_process->profile_manager()->CreateProfileAsync(
-      path,
-      base::Bind(&OnProfileCreated,
-                 always_create,
-                 desktop_type),
-      string16(),
-      string16(),
-      false);
-
+  ProfileManager::SwitchToProfile(path, desktop_type, always_create);
   ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
 }
 
 void AvatarMenuModel::EditProfile(size_t index) {
   Browser* browser = browser_;
   if (!browser) {
     Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
         profile_info_->GetPathOfProfileAtIndex(GetItemAt(index).model_index));
     browser = new Browser(Browser::CreateParams(profile,
                                                 chrome::GetActiveDesktop()));
@@ skipping 159 matching lines @@
   contents->GetController().LoadURL(
     logout_url, content::Referrer(),
     content::PAGE_TRANSITION_GENERATED, std::string());
 
   // This object may be destructed when the menu closes but we need something
   // around to finish the sign-out process and close the profile windows.
   new SignoutTracker(current_profile, GURL(landing_url), contents);
 
   return contents;  // returned for testing purposes
 }