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

chrome/browser/ui/sync/one_click_signin_helper.cc

Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index c7662588446dc679b019007d0207a18279b608e3..27a4a7e78506bc26a8896e27b66b232a00dd7c97 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -1184,6 +1184,16 @@ bool OneClickSigninHelper::HandleCrossAccountError(
     // TODO(atwilson): Move this into OneClickSigninSyncStarter.
     // The tab modal dialog always executes its callback before |contents|
     // is deleted.
+
+    // If the user signs in from the new avatar bubble, the confirm email dialog
+    // would dismiss the avatar bubble, thus it won't show any confirmation upon
+    // sign in completes. This cofirmation dialog already mentions that user

[Roger Tawa OOO till Jul 10th, 2014/08/06 21:04:42]

cofirmation --> confirmation

[guohui, 2014/08/06 21:19:44]

Done.

+    // 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 (start_mode == OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST)
+      start_mode = OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
+
     Browser* browser = chrome::FindBrowserWithWebContents(contents);
     ConfirmEmailDialogDelegate::AskForConfirmation(
         contents,