suppress user/password dialog when re-enabling sync

chrome/browser/ui/webui/sync_setup_handler.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/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/basictypes.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 474 matching lines @@
   if (!error_message.empty())
     args.SetString("error_message", error_message);
   if (fatal_error)
     args.SetBoolean("fatalError", true);
   args.SetString("captchaUrl", captcha);
   StringValue page("login");
   web_ui()->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 }
 
+// TODO(kochi): Handle error conditions (timeout, other failures).
+void SyncSetupHandler::DisplaySpinner() {
+  configuring_sync_ = true;
+  StringValue page("spinner");
+  DictionaryValue args;
+  web_ui()->CallJavascriptFunction(
+      "SyncSetupOverlay.showSyncSetupPage", page, args);
+}
+
 void SyncSetupHandler::RecordSignin() {
   // By default, do nothing - subclasses can override.
 }
 
 void SyncSetupHandler::DisplayGaiaSuccessAndClose() {
   RecordSignin();
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndClose");
 }
 
 void SyncSetupHandler::DisplayGaiaSuccessAndSettingUp() {
   RecordSignin();
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndSettingUp");
 }
 
 void SyncSetupHandler::ShowFatalError() {
   // For now, just send the user back to the login page. Ultimately may want
   // to give different feedback (especially for chromeos).
+#if !defined(OS_CHROMEOS)
   DisplayGaiaLogin(true);
+#endif
 }
 
 void SyncSetupHandler::OnDidClosePage(const ListValue* args) {
   CloseSyncSetup();
 }
 
 void SyncSetupHandler::HandleSubmitAuth(const ListValue* args) {
   std::string json;
   if (!args->GetString(0, &json)) {
     NOTREACHED() << "Could not read JSON argument";
@@ skipping 58 matching lines @@
   DCHECK(IsActiveLogin());
 
   // Gaia credentials are valid - update the UI.
   DisplayGaiaSuccessAndSettingUp();
 }
 
 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());
+#else
+  CloseOverlay();
+#endif
 }
 
 Profile* SyncSetupHandler::GetProfile() const {
   return Profile::FromWebUI(web_ui());
 }
 
 ProfileSyncService* SyncSetupHandler::GetSyncService() const {
   return ProfileSyncServiceFactory::GetForProfile(GetProfile());
 }
 
@@ skipping 149 matching lines @@
     }
 
     // Let the various services know that we're no longer active.
     GetLoginUIService()->LoginUIClosed(web_ui());
     if (sync_service)
       sync_service->set_setup_in_progress(false);
 
     // 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
     }
   }
 
   configuring_sync_ = false;
   signin_tracker_.reset();
 }
 
 void SyncSetupHandler::OpenSyncSetup(bool force_login) {
   ProfileSyncService* service = GetSyncService();
   if (!service) {
@@ skipping 32 matching lines @@
   // TODO(kochi): Handle ChromeOS re-enable sync case (http://crosbug/27956).
   if (force_login ||
       !service->AreCredentialsAvailable() ||
       service->GetAuthError().state() != GoogleServiceAuthError::NONE) {
     // User is not logged in, or login has been specially requested - need to
     // display login UI (cases 1-4).
     DisplayGaiaLogin(false);
   } else {
     // User is already logged in. They must have brought up the config wizard
     // via the "Advanced..." button or through One-Click signin (cases 5/6).
+#if !defined(OS_CHROMEOS)
     DisplayConfigureSync(true, false);

[Andrew T Wilson (Slow), 2012/04/04 17:55:30]

I think this is wrong now. You should be #if-ing out the call to
DisplayGaiaLogin(). We really should remove that function on cros.

[kochi, 2012/04/04 18:07:09]

Done.

+#else
+    PrepareConfigDialog();
+#endif
   }
 
   ShowSetupUI();
 }
 
+void SyncSetupHandler::PrepareConfigDialog() {
+  // On Chrome OS user is always logged in. Instead of showing login dialog,
+  // show spinner until the backend gets ready to configure sync.
+  ProfileSyncService* service = GetSyncService();
+  if (!service->sync_initialized()) {
+    // To listen to the token available notifications, start SigninTracker.
+    signin_tracker_.reset(
+        new SigninTracker(GetProfile(), this,
+                          SigninTracker::SERVICES_INITIALIZING));
+    service->set_setup_in_progress(true);
+    service->UnsuppressAndStart();
+    DisplaySpinner();
+  } else {
+    DisplayConfigureSync(true, false);
+  }
+}
+
 // Private member functions.
 
 bool SyncSetupHandler::FocusExistingWizardIfPresent() {
   LoginUIService* service = GetLoginUIService();
   if (!service->current_login_ui())
     return false;
   service->FocusLoginUI();
   return true;
 }
 
@@ skipping 25 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }