Change all the places where the multi-purpose sync error link is surfaced to call a common routine that either shows a login prompt or shows the passphrase prompt depending on the reason for the error.

BUG=68962
TEST=none

Review URL: http://codereview.chromium.org/6293010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71844 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
index ac75242..44718a5 100644
--- a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
+++ b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm
@@ -1429,9 +1429,11 @@ const int kDisabledIndex = 1;
   syncService_->ShowConfigure(NULL);
 }
 
+// Called when the user clicks on the multi-purpose 'sync problem'
+// link.
 - (IBAction)doSyncReauthentication:(id)sender {
   DCHECK(syncService_ && !syncService_->IsManaged());
-  syncService_->ShowLoginDialog(NULL);
+  syncService_->ShowErrorUI(NULL);
 }
 
 - (void)setPasswordManagerEnabledIndex:(NSInteger)value {
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
index e74a873..e70ea19 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
@@ -986,7 +986,7 @@ gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender,
                                                   GdkEventButton* event) {
   if (sender == sync_error_button_) {
     DCHECK(sync_service_ && !sync_service_->IsManaged());
-    sync_service_->ShowLoginDialog(NULL);
+    sync_service_->ShowErrorUI(NULL);
   }
 
   return FALSE;
diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.cc b/chrome/browser/ui/gtk/options/content_page_gtk.cc
index 1a3d72e4..fe3fddc 100644
--- a/chrome/browser/ui/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/ui/gtk/options/content_page_gtk.cc
@@ -603,7 +603,7 @@ void ContentPageGtk::OnSyncCustomizeButtonClicked(GtkWidget* widget) {
 
 void ContentPageGtk::OnSyncActionLinkClicked(GtkWidget* widget) {
   DCHECK(sync_service_ && !sync_service_->IsManaged());
-  sync_service_->ShowConfigure(NULL);
+  sync_service_->ShowErrorUI(NULL);
 }
 
 void ContentPageGtk::OnStopSyncDialogResponse(GtkWidget* widget, int response) {
diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc
index 61a5971..21ffe74 100644
--- a/chrome/browser/ui/views/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmark_bar_view.cc
@@ -1205,7 +1205,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,
   if (sender->tag() == kSyncErrorButtonTag) {
     DCHECK(sender == sync_error_button_);
     DCHECK(sync_service_ && !sync_service_->IsManaged());
-    sync_service_->ShowLoginDialog(GetWindow()->GetNativeWindow());
+    sync_service_->ShowErrorUI(GetWindow()->GetNativeWindow());
     return;
   }
 
diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc
index 7bcc773..9c2d161 100644
--- a/chrome/browser/ui/views/options/content_page_view.cc
+++ b/chrome/browser/ui/views/options/content_page_view.cc
@@ -160,7 +160,7 @@ void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
   }
   if (source == sync_action_link_) {
     DCHECK(sync_service_ && !sync_service_->IsManaged());
-    sync_service_->ShowLoginDialog(GetWindow()->GetNativeWindow());
+    sync_service_->ShowErrorUI(GetWindow()->GetNativeWindow());
     return;
   }
   if (source == privacy_dashboard_link_) {