Restructure user-creation flow and surface errors

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 91 matching lines @@
 }
 
 void CreateDesktopShortcutForProfile(Profile* profile,
                                      Profile::CreateStatus status) {
   ProfileShortcutManager* shortcut_manager =
       g_browser_process->profile_manager()->profile_shortcut_manager();
   if (shortcut_manager)
     shortcut_manager->CreateProfileShortcut(profile->GetPath());
 }
 
-void OnProfileCreated(
-    const std::vector<ProfileManager::CreateCallback>& callbacks,
-    Profile* profile,
-    Profile::CreateStatus status) {
-  std::vector<ProfileManager::CreateCallback>::const_iterator it;
-  for (it = callbacks.begin(); it != callbacks.end(); ++it) {
-    it->Run(profile, status);
-  }
-}
-
 }  // namespace
 
 BrowserOptionsHandler::BrowserOptionsHandler()
     : page_initialized_(false),
       template_url_service_(NULL),
       weak_ptr_factory_(this) {
 #if !defined(OS_MACOSX)
   default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
 #endif
 #if(!defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN))
@@ skipping 947 matching lines @@
 #if defined(ENABLE_MANAGED_USERS)
     ManagedUserRegistrationService* registration_service =
         ManagedUserRegistrationServiceFactory::GetForProfile(profile);
     callbacks.push_back(registration_service->GetRegistrationAndInitCallback());
 #else
     NOTREACHED();
 #endif
   }
 
   ProfileManager::CreateMultiProfileAsync(
-      name, icon, base::Bind(&OnProfileCreated, callbacks),
-      desktop_type, managed_user);
+      name, icon, base::Bind(&BrowserOptionsHandler::OnProfileCreated,
+                             weak_ptr_factory_.GetWeakPtr(),
+                             desktop_type, managed_user, callbacks),
+      managed_user);
+}
+
+void BrowserOptionsHandler::OnProfileCreated(
+    chrome::HostDesktopType desktop_type,
+    bool is_managed,
+    const std::vector<ProfileManager::CreateCallback>& callbacks,
+    Profile* profile,
+    Profile::CreateStatus status) {
+  std::vector<ProfileManager::CreateCallback>::const_iterator it;
+  for (it = callbacks.begin(); it != callbacks.end(); ++it) {
+    it->Run(profile, status);
+  }
+
+  switch (status) {
+    case Profile::CREATE_STATUS_FAIL: {
+      web_ui()->CallJavascriptFunction(
+          "BrowserOptions.showCreateProfileLocalError");
+      break;
+    }
+    case Profile::CREATE_STATUS_CREATED: {
+      // Do nothing for an intermediate status.
+      break;
+    }
+    case Profile::CREATE_STATUS_INITIALIZED: {
+      base::FundamentalValue is_managed_value(is_managed);
+      web_ui()->CallJavascriptFunction(
+          "BrowserOptions.showCreateProfileSuccess",
+          is_managed_value);
+
+      // Opening the new window must be the last action, after all callbacks
+      // have been run, to give them a chance to initialize the profile.
+      ProfileManager::FindOrCreateNewWindowForProfile(
+          profile,
+          chrome::startup::IS_PROCESS_STARTUP,
+          chrome::startup::IS_FIRST_RUN,
+          desktop_type,
+          false);
+      break;
+    }
+  }
 }
 
 void BrowserOptionsHandler::ObserveThemeChanged() {
   Profile* profile = Profile::FromWebUI(web_ui());
 #if defined(TOOLKIT_GTK)
   GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
   bool is_gtk_theme = theme_service->UsingNativeTheme();
   base::FundamentalValue gtk_enabled(!is_gtk_theme);
   web_ui()->CallJavascriptFunction("BrowserOptions.setGtkThemeButtonEnabled",
                                    gtk_enabled);
@@ skipping 436 matching lines @@
   base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
                                   is_extension_controlled);
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options