| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 cr.define('options', function() { | 5 cr.define('options', function() { | 
| 6   var OptionsPage = options.OptionsPage; | 6   var OptionsPage = options.OptionsPage; | 
| 7   var ArrayDataModel = cr.ui.ArrayDataModel; | 7   var ArrayDataModel = cr.ui.ArrayDataModel; | 
| 8   var RepeatingButton = cr.ui.RepeatingButton; | 8   var RepeatingButton = cr.ui.RepeatingButton; | 
| 9   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator; | 9   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator; | 
| 10 | 10 | 
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 913       else | 913       else | 
| 914         $('sync-status').classList.remove('sync-error'); | 914         $('sync-status').classList.remove('sync-error'); | 
| 915 | 915 | 
| 916       // Disable the "customize / set up sync" button if sync has an | 916       // Disable the "customize / set up sync" button if sync has an | 
| 917       // unrecoverable error. Also disable the button if sync has not been set | 917       // unrecoverable error. Also disable the button if sync has not been set | 
| 918       // up and the user is being presented with a link to re-auth. | 918       // up and the user is being presented with a link to re-auth. | 
| 919       // See crbug.com/289791. | 919       // See crbug.com/289791. | 
| 920       customizeSyncButton.disabled = | 920       customizeSyncButton.disabled = | 
| 921           syncData.hasUnrecoverableError || | 921           syncData.hasUnrecoverableError || | 
| 922           (!syncData.setupCompleted && !$('sync-action-link').hidden); | 922           (!syncData.setupCompleted && !$('sync-action-link').hidden); | 
| 923 |  | 
| 924       // Move #enable-auto-login-checkbox to a different location on CrOS. |  | 
| 925       if (cr.isChromeOs) { |  | 
| 926         $('sync-general').insertBefore($('sync-status').nextSibling, |  | 
| 927                                        $('enable-auto-login-checkbox')); |  | 
| 928       } |  | 
| 929       $('enable-auto-login-checkbox').hidden = !syncData.autoLoginVisible; |  | 
| 930     }, | 923     }, | 
| 931 | 924 | 
| 932     /** | 925     /** | 
| 933      * Update the UI depending on whether the current profile has a pairing for | 926      * Update the UI depending on whether the current profile has a pairing for | 
| 934      * Easy Unlock. | 927      * Easy Unlock. | 
| 935      * @param {boolean} hasPairing True if the current profile has a pairing. | 928      * @param {boolean} hasPairing True if the current profile has a pairing. | 
| 936      */ | 929      */ | 
| 937     updateEasyUnlock_: function(hasPairing) { | 930     updateEasyUnlock_: function(hasPairing) { | 
| 938       $('easy-unlock-setup').hidden = hasPairing; | 931       $('easy-unlock-setup').hidden = hasPairing; | 
| 939       $('easy-unlock-enable').hidden = !hasPairing; | 932       $('easy-unlock-enable').hidden = !hasPairing; | 
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1799     BrowserOptions.getLoggedInUsername = function() { | 1792     BrowserOptions.getLoggedInUsername = function() { | 
| 1800       return BrowserOptions.getInstance().username_; | 1793       return BrowserOptions.getInstance().username_; | 
| 1801     }; | 1794     }; | 
| 1802   } | 1795   } | 
| 1803 | 1796 | 
| 1804   // Export | 1797   // Export | 
| 1805   return { | 1798   return { | 
| 1806     BrowserOptions: BrowserOptions | 1799     BrowserOptions: BrowserOptions | 
| 1807   }; | 1800   }; | 
| 1808 }); | 1801 }); | 
| OLD | NEW | 
|---|