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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 7590018: sync: temp fix for ShowErrorUI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index c77c510fe0773190aabd9d7dbbfad3d4b3bc6488..f3531172b9e111561663b9ed0992f5c635940bdf 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -812,7 +812,10 @@ void ProfileSyncService::ShowErrorUI() {
return;
}
- ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
+ if (last_auth_error_.state() != AuthError::NONE)
binji 2011/08/11 18:15:39 Will this branch be taken if there is a passphrase
tim (not reviewing) 2011/08/11 18:18:35 Only if there is also an authentication error, in
+ ShowLoginDialog();
+ else
+ ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
}
void ProfileSyncService::ShowConfigure(bool sync_everything) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698