Restructure user-creation flow and surface errors

chrome/browser/ui/sync/one_click_signin_sync_starter.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/sync/one_click_signin_sync_starter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 170 matching lines @@
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   DCHECK(!signin->GetUsernameForAuthInProgress().empty());
   DCHECK(policy_client_);
   // Create a new profile and have it call back when done so we can inject our
   // signin credentials.
   size_t icon_index = g_browser_process->profile_manager()->
       GetProfileInfoCache().ChooseAvatarIconIndexForNewProfile();
   ProfileManager::CreateMultiProfileAsync(
       UTF8ToUTF16(signin->GetUsernameForAuthInProgress()),
       UTF8ToUTF16(ProfileInfoCache::GetDefaultAvatarIconUrl(icon_index)),
-      base::Bind(&OneClickSigninSyncStarter::CompleteSigninForNewProfile,
-                 weak_pointer_factory_.GetWeakPtr()),
-      desktop_type_,
+      base::Bind(&OneClickSigninSyncStarter::CompleteInitForNewProfile,
+                 weak_pointer_factory_.GetWeakPtr(), desktop_type_),
       false);
 }
 
-void OneClickSigninSyncStarter::CompleteSigninForNewProfile(
+void OneClickSigninSyncStarter::CompleteInitForNewProfile(
+    chrome::HostDesktopType desktop_type,
     Profile* new_profile,
     Profile::CreateStatus status) {
   DCHECK_NE(profile_, new_profile);
   if (status == Profile::CREATE_STATUS_FAIL) {
     // TODO(atwilson): On error, unregister the client to release the DMToken
     // and surface a better error for the user.
     NOTREACHED() << "Error creating new profile";
     CancelSigninAndDelete();
     return;
   }
@@ skipping 20 matching lines @@
 
     // We've transferred our credentials to the new profile - notify that
     // the signin for the original profile was cancelled (must do this after
     // we have called Initialize() with the new profile, as otherwise this
     // object will get freed when the signin on the old profile is cancelled.
     old_signin_manager->SignOut();
 
     // Load policy for the just-created profile - once policy has finished
     // loading the signin process will complete.
     LoadPolicyWithCachedClient();
+
+    // Open the profile's first window, after all initialization.
+    ProfileManager::FindOrCreateNewWindowForProfile(
+      new_profile,
+      chrome::startup::IS_PROCESS_STARTUP,
+      chrome::startup::IS_FIRST_RUN,
+      desktop_type,
+      false);
   }
 }
 #endif
 
 void OneClickSigninSyncStarter::ConfirmAndSignin() {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   // browser_ can be null for unit tests.
   if (browser_ && confirmation_required_ == CONFIRM_UNTRUSTED_SIGNIN) {
     // Display a confirmation dialog to the user.
     browser_->window()->ShowOneClickSigninBubble(
@@ skipping 135 matching lines @@
 
 void OneClickSigninSyncStarter::ShowSyncSettingsPageOnSameTab() {
   std::string url = std::string(chrome::kChromeUISettingsURL) +
       chrome::kSyncSetupSubPage;
   chrome::NavigateParams params(
       browser_, GURL(url), content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = CURRENT_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }