Make sure to display an errors that occur during the chrome sign in process

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/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 489 matching lines @@
     args.SetBoolean("usePassphrase", service->IsUsingSecondaryPassphrase());
   }
 
   StringValue page("configure");
   web_ui()->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 
   if (UseWebBasedSigninFlow()) {
     // Make sure the tab used for the Gaia sign in does not cover the settings
     // tab.
-    BringTabToFront(web_ui()->GetWebContents());
+    FocusUI();
   }
 }
 
 void SyncSetupHandler::ConfigureSyncDone() {
   StringValue page("done");
   web_ui()->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page);
 
   // Suppress the sync promo once the user signs into sync. This way the user
   // doesn't see the sync promo even if they sign out of sync later on.
@@ skipping 313 matching lines @@
 
   // Gaia credentials are valid - update the UI.
   DisplayGaiaSuccessAndSettingUp();
 }
 
 void SyncSetupHandler::SigninFailed(const GoogleServiceAuthError& error) {
   // Stop a timer to handle timeout in waiting for checking network connection.
   backend_start_timer_.reset();
 
   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 can happen when auth token is invalid and
-  // cannot start sync backend.
-  if (retry_on_signin_failure_) {
-    DisplayGaiaLogin(GetSyncService()->HasUnrecoverableError());
+
+  // If using web-based sign in flow, don't show the gaia sign in page again
+  // since there is no way to show the user an error message.
+  if (UseWebBasedSigninFlow()) {
+    CloseSyncSetup();
   } else {
-    // TODO(peria): Show error dialog for prompting sign in and out on
-    // Chrome OS. http://crbug.com/128692
-    CloseOverlay();
+    // 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 can happen when auth token is invalid and
+    // cannot start sync backend.
+    // If using web-based sign in flow, don't show the gaia sign in page again
+    // since there is no way to show the user an error message.
+    if (retry_on_signin_failure_) {

[Evan Stade, 2012/12/04 20:42:32]

if {} else {if {} else {}} ==> if {} else if {} else {}

[Roger Tawa OOO till Jul 10th, 2012/12/04 21:18:36]

Done.

+      DisplayGaiaLogin(GetSyncService()->HasUnrecoverableError());
+    } else {
+      // TODO(peria): Show error dialog for prompting sign in and out on
+      // Chrome OS. http://crbug.com/128692
+      CloseOverlay();
+    }
   }
 }
 
 Profile* SyncSetupHandler::GetProfile() const {
   return Profile::FromWebUI(web_ui());
 }
 
 ProfileSyncService* SyncSetupHandler::GetSyncService() const {
   return ProfileSyncServiceFactory::GetForProfile(GetProfile());
 }
@@ skipping 351 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;
 }