diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:32:56 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:32:56 +0000 |
| commit | fc0d0378566936f09ead042d19b8031aebea0984 (patch) | |
| tree | df901fdc241da4ea67abc731273252a5ec18ac62 /chrome/browser/cocoa | |
| parent | 690368961bc9fd8214b8e9b57b7bd0b70b98e951 (diff) | |
| download | chromium_src-fc0d0378566936f09ead042d19b8031aebea0984.zip chromium_src-fc0d0378566936f09ead042d19b8031aebea0984.tar.gz chromium_src-fc0d0378566936f09ead042d19b8031aebea0984.tar.bz2 | |
Button label logic on mac should match other platforms and show "stop syncing" whenever sync setup is done, regardless of error state.
BUG=48973
TEST=invalidate login creds on mac, check options panel
Review URL: http://codereview.chromium.org/2918005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 607a0d5..4065f0b 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -1723,8 +1723,7 @@ const int kDisabledIndex = 1; [syncButton_ setEnabled:!syncService_->WizardIsVisible()]; NSString* buttonLabel; - if (syncService_->HasSyncSetupCompleted() - && status != sync_ui_util::SYNC_ERROR) { + if (syncService_->HasSyncSetupCompleted()) { buttonLabel = l10n_util::GetNSStringWithFixup( IDS_SYNC_STOP_SYNCING_BUTTON_LABEL); [syncCustomizeButton_ setHidden:false]; |