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

Unified Diff: chrome/browser/dom_ui/new_tab_page_sync_handler.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/dom_ui/new_tab_page_sync_handler.cc
===================================================================
--- chrome/browser/dom_ui/new_tab_page_sync_handler.cc (revision 71694)
+++ chrome/browser/dom_ui/new_tab_page_sync_handler.cc (working copy)
@@ -155,26 +155,7 @@
if (!sync_service_->IsSyncEnabled())
return;
if (sync_service_->HasSyncSetupCompleted()) {
- if (sync_service_->observed_passphrase_required()) {
- if (sync_service_->IsUsingSecondaryPassphrase())
- sync_service_->PromptForExistingPassphrase(NULL);
- else
- sync_service_->SigninForPassphrase(dom_ui_->tab_contents());
- return;
- }
- if (sync_service_->GetAuthError().state() ==
- GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
- sync_service_->GetAuthError().state() ==
- GoogleServiceAuthError::CAPTCHA_REQUIRED ||
- sync_service_->GetAuthError().state() ==
- GoogleServiceAuthError::ACCOUNT_DELETED ||
- sync_service_->GetAuthError().state() ==
- GoogleServiceAuthError::ACCOUNT_DISABLED ||
- sync_service_->GetAuthError().state() ==
- GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
- sync_service_->ShowLoginDialog(NULL);
- return;
- }
+ sync_service_->ShowErrorUI(NULL);
DictionaryValue value;
value.SetString("syncEnabledMessage",
l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO,
« no previous file with comments | « no previous file | chrome/browser/resources/new_new_tab.css » ('j') | chrome/browser/sync/profile_sync_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698