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

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

Issue 6293010: Change all the places where the multi-purpose sync error link is surfaced to ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc (revision 71694)
+++ chrome/browser/sync/profile_sync_service.cc (working copy)
@@ -726,6 +726,25 @@
FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
}
+void ProfileSyncService::ShowErrorUI(gfx::NativeWindow parent_window) {
+ if (observed_passphrase_required()) {
+ if (IsUsingSecondaryPassphrase())
+ PromptForExistingPassphrase(parent_window);
+ else
+ ShowLoginDialog(parent_window);
+ return;
+ }
+ const GoogleServiceAuthError& error = GetAuthError();
+ if (error.state() == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
+ error.state() == GoogleServiceAuthError::CAPTCHA_REQUIRED ||
+ error.state() == GoogleServiceAuthError::ACCOUNT_DELETED ||
+ error.state() == GoogleServiceAuthError::ACCOUNT_DISABLED ||
+ error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
tim (not reviewing) 2011/01/19 21:34:29 nit - extra space after ==
+ ShowLoginDialog(parent_window);
+ }
+}
+
+
void ProfileSyncService::ShowConfigure(gfx::NativeWindow parent_window) {
if (WizardIsVisible()) {
wizard_.Focus();
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/ui/cocoa/options/preferences_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698