summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/options
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 21:48:01 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 21:48:01 +0000
commit1c738470c6dd8f53889f877bfe8ca394fe0f202e (patch)
treeaeacfd0506b22f21d3cb3149cacfa963c73c0fd3 /chrome/browser/ui/cocoa/options
parente7d5089c8c879e6af4ba82bde7919335b02e09d0 (diff)
downloadchromium_src-1c738470c6dd8f53889f877bfe8ca394fe0f202e.zip
chromium_src-1c738470c6dd8f53889f877bfe8ca394fe0f202e.tar.gz
chromium_src-1c738470c6dd8f53889f877bfe8ca394fe0f202e.tar.bz2
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
Diffstat (limited to 'chrome/browser/ui/cocoa/options')
-rw-r--r--chrome/browser/ui/cocoa/options/preferences_window_controller.mm4
1 files changed, 3 insertions, 1 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 {