Always use ProfileSyncService::ShowErrorUI to handle error links.

chrome/browser/dom_ui/options/personal_options_handler.cc

 // Copyright (c) 2011 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/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 147 matching lines @@
   localized_strings->SetString("account",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME));
   localized_strings->SetString("enableScreenlock",
       l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
 #endif
 }
 
 void PersonalOptionsHandler::RegisterMessages() {
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback(
+      "showSyncActionDialog",
+      NewCallback(this, &PersonalOptionsHandler::ShowSyncActionDialog));
+  dom_ui_->RegisterMessageCallback(
       "showSyncLoginDialog",
       NewCallback(this, &PersonalOptionsHandler::ShowSyncLoginDialog));
   dom_ui_->RegisterMessageCallback(
       "showCustomizeSyncDialog",
       NewCallback(this, &PersonalOptionsHandler::ShowCustomizeSyncDialog));
   dom_ui_->RegisterMessageCallback(
       "themesReset",
       NewCallback(this, &PersonalOptionsHandler::ThemesReset));
 #if defined(TOOLKIT_GTK)
   dom_ui_->RegisterMessageCallback(
@@ skipping 136 matching lines @@
     DictionaryValue args;
     SyncSetupFlow::GetArgsForConfigure(sync_service, &args);
 
     dom_ui_->CallJavascriptFunction(
         L"PersonalOptions.setRegisteredDataTypes", args);
   } else {
     dom_ui_->CallJavascriptFunction(L"options.PersonalOptions.hideSyncSection");
   }
 }
 
-void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) {
+void PersonalOptionsHandler::ShowSyncActionDialog(const ListValue* args) {
   ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();
   DCHECK(service);
-  if (service->HasSyncSetupCompleted()) {
-    service->ShowErrorUI(NULL);
-  } else {
+  service->ShowErrorUI(NULL);
+}
+
+void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) {
 #if defined(OS_CHROMEOS)
-    std::string email = chromeos::UserManager::Get()->logged_in_user().email();
-    string16 message = l10n_util::GetStringFUTF16(
-        IDS_SYNC_LOGIN_INTRODUCTION,
-        l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-    dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin(
-        dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this);
+  std::string email = chromeos::UserManager::Get()->logged_in_user().email();
+  string16 message = l10n_util::GetStringFUTF16(
+      IDS_SYNC_LOGIN_INTRODUCTION,
+      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+  dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin(
+      dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this);
 #else
-    service->ShowLoginDialog(NULL);
-    ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
+  ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();
+  DCHECK(service);
+  service->ShowLoginDialog(NULL);
+  ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
 #endif
-  }
 }
 
 void PersonalOptionsHandler::ShowCustomizeSyncDialog(const ListValue* args) {
   ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();
   DCHECK(service);
   service->ShowConfigure(NULL);
 }
 
 void PersonalOptionsHandler::ThemesReset(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_ThemesReset"));
@@ skipping 20 matching lines @@
   const SkBitmap& account_picture =
       chromeos::UserManager::Get()->logged_in_user().image();
 
   if (!account_picture.isNull()) {
     StringValue data_url(web_ui_util::GetImageDataUrl(account_picture));
     dom_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture",
         data_url);
   }
 }
 #endif