suppress user/password dialog when re-enabling sync

chrome/browser/ui/webui/sync_setup_handler.cc

Index: chrome/browser/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 2663f5f8a90e502a7f09b9e5e1f1a0a9f710b84b..4376fa3348f22c4b129bf15edb81855b2a964e18 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -20,6 +20,8 @@
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/signin/token_service.h"
+#include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -490,6 +492,14 @@ void SyncSetupHandler::DisplayGaiaLoginWithErrorMessage(
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 }
 
+// TODO(kochi): Handle error conditions (timeout, other failures).
+void SyncSetupHandler::DisplaySpinner() {
+  configuring_sync_ = true;
+  StringValue page("spinner");
+  web_ui()->CallJavascriptFunction(
+      "SyncSetupOverlay.showSyncSetupPage", page, DictionaryValue());
+}
+
 void SyncSetupHandler::RecordSignin() {
   // By default, do nothing - subclasses can override.
 }
@@ -586,7 +596,11 @@ void SyncSetupHandler::SigninFailed(const GoogleServiceAuthError& error) {
   last_signin_error_ = error;
   // Got a failed signin - this is either just a typical auth error, or a
   // sync error (treat sync errors as "fatal errors" - i.e. non-auth errors).
+  // On ChromeOS, this condition should trigger the orange badge on wrench menu
+  // and prompt to sign out.
+#if !defined(OS_CHROMEOS)
   DisplayGaiaLogin(GetSyncService()->unrecoverable_error_detected());
+#endif
 }
 
 Profile* SyncSetupHandler::GetProfile() const {
@@ -598,14 +612,21 @@ ProfileSyncService* SyncSetupHandler::GetSyncService() const {
 }
 
 void SyncSetupHandler::SigninSuccess() {
+  LOG(WARNING) << "SigninSuccess()";
   DCHECK(GetSyncService()->sync_initialized());
   // If we have signed in while sync is already setup, it must be due to some
   // kind of re-authentication flow. In that case, just close the signin dialog
   // rather than forcing the user to go through sync configuration.
-  if (GetSyncService()->HasSyncSetupCompleted())
+  if (GetSyncService()->HasSyncSetupCompleted()) {
     DisplayGaiaSuccessAndClose();
-  else
+  } else {
+#if !defined(OS_CHROMEOS)
     DisplayConfigureSync(false, false);
+#else
+    // On ChromeOS, clicking on "Set up Sync" should show advanced settings.
+    DisplayConfigureSync(true, false);
+#endif
+  }
 }
 
 void SyncSetupHandler::HandleConfigure(const ListValue* args) {
@@ -756,11 +777,12 @@ void SyncSetupHandler::CloseSyncSetup() {
     // Make sure user isn't left half-logged-in (signed in, but without sync
     // started up). If the user hasn't finished setting up sync, then sign out
     // and shut down sync.
-
     if (sync_service && !sync_service->HasSyncSetupCompleted()) {
       DVLOG(1) << "Signin aborted by user action";
       sync_service->DisableForUser();
+#if !defined(OS_CHROMEOS)
       GetSignin()->SignOut();
+#endif
     }
   }
 
@@ -795,8 +817,37 @@ void SyncSetupHandler::OpenSyncSetup(bool force_login) {
     // via the "Advanced..." button or the wrench menu.
     DisplayConfigureSync(true, false);
   } else {
+#if !defined(OS_CHROMEOS)
     // User is not logged in - need to display login UI.
     DisplayGaiaLogin(false);
+#else
+    // On Chrome OS user is always logged in. Instead of showing login dialog,
+    // show spinner until the backend gets ready to configure sync.
+
+    // 1. To make PSS:AreCredentialsAvailable() to return true, first we need
+    //    to unsppress the flag.
+    browser_sync::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
+    sync_prefs.SetStartSuppressed(false);
+
+    // 2. To listen to the token available notifications, start SigninTracker.
+    signin_tracker_.reset(new SigninTracker(GetProfile(), this));
+    TokenService* token_service =
+        TokenServiceFactory::GetForProfile(GetProfile());
+    DCHECK(token_service);
+    if (token_service->AreCredentialsValid()) {
+      token_service->StartFetchingTokens();
+    } else {
+      LOG(WARNING) << "TokenService: credentials are invalid!";
+      token_service->LoadTokensFromDB();
+    }
+    if (!service->sync_initialized()) {
+      service->set_setup_in_progress(true);
+      service->UnsuppressAndStart();
+      DisplaySpinner();
+    } else {
+      DisplayConfigureSync(true, false);
+    }
+#endif
   }
 
   ShowSetupUI();