Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6830)

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 16173006: No longer trigger signin errors on connection_failed for sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_tracker_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d2a0e8f42b30dea3b3308f694aa25f5e0c46f6cf..79fe6101ae8a0ab3b806f00a5d4d20938cd76808 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -440,7 +440,15 @@ void SyncSetupHandler::DisplayConfigureSync(bool show_advanced,
#endif
service->UnsuppressAndStart();
- DisplaySpinner();
+
+ // See if it's even possible to bring up the sync backend - if not
+ // (unrecoverable error?), don't bother displaying a spinner that will be
+ // immediately closed because this leads to some ugly infinite UI loop (see
+ // http://crbug.com/244769).
+ if (SigninTracker::GetSigninState(GetProfile(), NULL) !=
+ SigninTracker::WAITING_FOR_GAIA_VALIDATION) {
+ DisplaySpinner();
+ }
// To listen to the token available notifications, start SigninTracker.
signin_tracker_.reset(
« no previous file with comments | « chrome/browser/signin/signin_tracker_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698