Make sure sync setup completes when signing in from the avatar bubble with modal warnings

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/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 167 matching lines @@
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnCancelSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CANCEL);
   if (sync_starter_ != NULL)
     sync_starter_->CancelSigninAndDelete();
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnContinueSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CONTINUE);
-  if (sync_starter_ != NULL)
+
+  if (sync_starter_ != NULL) {
+    // If the user signs in from the new avatar bubble, the enterprise
+    // confirmation dialog would dismiss the avatar bubble, thus it won't show
+    // any confirmation upon sign in completes. This cofirmation dialog already
+    // mentions that user data would be synced, thus we just start sync
+    // immediately.
+
+    // TODO(guohui): add a sync settings link to allow user to configure sync
+    // settings before sync starts.
+    if (sync_starter_->GetStartSyncMode() == CONFIRM_SYNC_SETTINGS_FIRST)
+      sync_starter_->SetStartSyncMode(SYNC_WITH_DEFAULT_SETTINGS);
     sync_starter_->LoadPolicyWithCachedCredentials();
+  }
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnSigninWithNewProfile() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_NEW_PROFILE);
-  if (sync_starter_ != NULL)
+
+  if (sync_starter_ != NULL) {
+    // TODO(guohui): add a sync settings link to allow user to configure sync
+    // settings before sync starts.
+    if (sync_starter_->GetStartSyncMode() == CONFIRM_SYNC_SETTINGS_FIRST)
+      sync_starter_->SetStartSyncMode(SYNC_WITH_DEFAULT_SETTINGS);
     sync_starter_->CreateNewSignedInProfile();
+  }
+}
+
+void OneClickSigninSyncStarter::SetStartSyncMode(StartSyncMode start_mode) {
+  start_mode_ = start_mode;
+}
+
+OneClickSigninSyncStarter::StartSyncMode
+    OneClickSigninSyncStarter::GetStartSyncMode() {
+  return start_mode_;
 }
 
 void OneClickSigninSyncStarter::OnRegisteredForPolicy(
     const std::string& dm_token, const std::string& client_id) {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   // If there's no token for the user (policy registration did not succeed) just
   // finish signing in.
   if (dm_token.empty()) {
     DVLOG(1) << "Policy registration failed";
     ConfirmAndSignin();
@@ skipping 156 matching lines @@
   }
 }
 
 void OneClickSigninSyncStarter::UntrustedSigninConfirmed(
     StartSyncMode response) {
   if (response == UNDO_SYNC) {
     CancelSigninAndDelete();  // This statement frees this object.
   } else {
     // If the user clicked the "Advanced" link in the confirmation dialog, then
     // override the current start_mode_ to bring up the advanced sync settings.
+
+    // If the user signs in from the new avatar bubble, the untrusted dialog
+    // would dismiss the avatar bubble, thus it won't show any confirmation upon
+    // sign in completes. This dialog already has a settings link, thus we just
+    // start sync immediately .
+
     if (response == CONFIGURE_SYNC_FIRST)
       start_mode_ = response;
+    else if (start_mode_ == CONFIRM_SYNC_SETTINGS_FIRST)
+      start_mode_ = SYNC_WITH_DEFAULT_SETTINGS;
+
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
     signin->CompletePendingSignin();
   }
 }
 
 void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(
     bool configure_sync_first) {
   if (configure_sync_first) {
     chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
   } else {
@@ skipping 213 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }