| 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,
|
|
|