Delay loading the NTP after sign in until MergeSession has been performed in

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/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 17 matching lines @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h"
+#include "chrome/common/profile_management_switches.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 OneClickSigninSyncStarter::OneClickSigninSyncStarter(
     Profile* profile,
     Browser* browser,
     const std::string& session_index,
@@ skipping 311 matching lines @@
       default:
         DisplayFinalConfirmationBubble(l10n_util::GetStringUTF16(
             IDS_SYNC_ERROR_SIGNING_IN));
         break;
     }
   }
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
+  if (!switches::IsEnableInlineSignin())
+    MergeSessionComplete(GoogleServiceAuthError(GoogleServiceAuthError::NONE));

[guohui, 2013/12/19 19:28:02]

So if only new profile management is turned on we will trigger sync callback
immediately without waiting for merge session to complete? Should we check for
both flags?

[Roger Tawa OOO till Jul 10th, 2013/12/19 20:46:33]

We do want to ship inline sign in without profile management, but not the
reverse.  But even if we did, the sign in would happen in the content area, so
there is no need to wait for merge session anyway.

+}
+
+void OneClickSigninSyncStarter::MergeSessionComplete(
+    const GoogleServiceAuthError& error) {
+  // Regardless of whether the merge session completed sucessfully or not,
+  // continue with sync starting.
+
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
 
   switch (start_mode_) {
     case SYNC_WITH_DEFAULT_SETTINGS: {
       // Just kick off the sync machine, no need to configure it first.
       ProfileSyncService* profile_sync_service = GetProfileSyncService();
       if (profile_sync_service)
         profile_sync_service->SetSyncSetupCompleted();
       FinishProfileSyncServiceSetup();
@@ skipping 118 matching lines @@
                                 false);
   contents->OpenURL(params);
 
   // Activate the tab.
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
   int content_index =
       browser->tab_strip_model()->GetIndexOfWebContents(contents);
   browser->tab_strip_model()->ActivateTabAt(content_index,
                                             false /* user_gesture */);
 }