Button label logic on mac should match other platforms and show "stop syncing...

chrome/browser/cocoa/preferences_window_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 1695 matching lines @@
 // TODO(akalin): Change the background of the status label/link on error.
 - (void)syncStateChanged {
   DCHECK(syncService_);
 
   string16 statusLabel, linkLabel;
   sync_ui_util::MessageType status =
       sync_ui_util::GetStatusLabels(syncService_, &statusLabel, &linkLabel);
 
   [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];
   } else if (syncService_->SetupInProgress()) {
     buttonLabel = l10n_util::GetNSStringWithFixup(
         IDS_SYNC_NTP_SETUP_IN_PROGRESS);
     [syncCustomizeButton_ setHidden:true];
   } else {
     buttonLabel = l10n_util::GetNSStringWithFixup(
         IDS_SYNC_START_SYNC_BUTTON_LABEL);
@@ skipping 291 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end