Merge 162319 - Fix "Please update your sync passphrase" link on Chrome OS settings.

chrome/browser/resources/options/browser_options.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
 
   //
@@ skipping 68 matching lines @@
 
       $('advanced-settings').addEventListener('webkitTransitionEnd',
           this.updateAdvancedSettingsExpander_.bind(this));
 
       if (cr.isChromeOS)
         UIAccountTweaks.applyGuestModeVisibility(document);
 
       // Sync (Sign in) section.
       this.updateSyncState_(loadTimeData.getValue('syncData'));
 
-      $('sync-action-link').onclick = function(event) {
-        if (cr.isChromeOS) {
-          // On Chrome OS, sign out the user and sign in again to get fresh
-          // credentials on auth errors.
-          SyncSetupOverlay.doSignOutOnAuthError();
-        } else {
-          SyncSetupOverlay.showErrorUI();
-        }
-      };
       $('start-stop-sync').onclick = function(event) {
         if (self.syncSetupCompleted)
           SyncSetupOverlay.showStopSyncingUI();
         else if (cr.isChromeOS)
           SyncSetupOverlay.showSetupUIWithoutLogin();
         else
           SyncSetupOverlay.showSetupUI();
       };
       $('customize-sync').onclick = function(event) {
         if (cr.isChromeOS)
@@ skipping 550 matching lines @@
       // TODO(estade): can this just be textContent?
       $('sync-status-text').innerHTML = syncData.statusText;
       var statusSet = syncData.statusText.length != 0;
       $('sync-overview').hidden = statusSet;
       $('sync-status').hidden = !statusSet;
 
       $('sync-action-link').textContent = syncData.actionLinkText;
       $('sync-action-link').hidden = syncData.actionLinkText.length == 0;
       $('sync-action-link').disabled = syncData.managed;
 
+      if (cr.isChromeOS && syncData.hasError) {
+        // On Chrome OS, sign out the user and sign in again to get fresh
+        // credentials on auth errors.
+        $('sync-action-link').onclick = function(event) {
+          SyncSetupOverlay.doSignOutOnAuthError();
+        };
+      } else {
+        $('sync-action-link').onclick = function(event) {
+          SyncSetupOverlay.showErrorUI();
+        };
+      }
+
       if (syncData.hasError)
         $('sync-status').classList.add('sync-error');
       else
         $('sync-status').classList.remove('sync-error');
 
       $('customize-sync').disabled = syncData.hasUnrecoverableError;
       // Move #enable-auto-login-checkbox to a different location on CrOS.
       if (cr.isChromeOs) {
         $('sync-general').insertBefore($('sync-status').nextSibling,
                                        $('enable-auto-login-checkbox'));
@@ skipping 696 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });