Change all the places where the multi-purpose sync error link is surfaced to ...

chrome/browser/dom_ui/new_tab_page_sync_handler.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
@@ skipping 137 matching lines @@
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
                         UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
 }
 
 void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
   DCHECK(!waiting_for_initial_page_load_);
   DCHECK(sync_service_);
   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,
                         sync_service_->GetAuthenticatedUsername()));
     dom_ui_->CallJavascriptFunction(L"syncAlreadyEnabled", value);
   } else {
     // User clicked the 'Start now' link to begin syncing.
     ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_NTP);
     sync_service_->ShowLoginDialog(NULL);
   }
@@ skipping 41 matching lines @@
       if (linkurl.empty()) {
         value.SetBoolean("linkurlisset", false);
       } else {
         value.SetBoolean("linkurlisset", true);
         value.SetString("linkurl", linkurl);
       }
     }
   }
   dom_ui_->CallJavascriptFunction(L"syncMessageChanged", value);
 }