Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Side by Side Diff: chrome/browser/resources/options/browser_options.js

Issue 235863025: Remove desktop auto-login since we don't plan on shipping it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 else 904 else
905 $('sync-status').classList.remove('sync-error'); 905 $('sync-status').classList.remove('sync-error');
906 906
907 // Disable the "customize / set up sync" button if sync has an 907 // Disable the "customize / set up sync" button if sync has an
908 // unrecoverable error. Also disable the button if sync has not been set 908 // unrecoverable error. Also disable the button if sync has not been set
909 // up and the user is being presented with a link to re-auth. 909 // up and the user is being presented with a link to re-auth.
910 // See crbug.com/289791. 910 // See crbug.com/289791.
911 customizeSyncButton.disabled = 911 customizeSyncButton.disabled =
912 syncData.hasUnrecoverableError || 912 syncData.hasUnrecoverableError ||
913 (!syncData.setupCompleted && !$('sync-action-link').hidden); 913 (!syncData.setupCompleted && !$('sync-action-link').hidden);
914
915 // Move #enable-auto-login-checkbox to a different location on CrOS.
rohitrao (ping after 24h) 2014/04/16 19:22:45 I deleted this because it seemed autologin-specifi
916 if (cr.isChromeOs) {
917 $('sync-general').insertBefore($('sync-status').nextSibling,
918 $('enable-auto-login-checkbox'));
919 }
920 $('enable-auto-login-checkbox').hidden = !syncData.autoLoginVisible;
921 }, 914 },
922 915
923 /** 916 /**
924 * Update the UI depending on whether the current profile has a pairing for 917 * Update the UI depending on whether the current profile has a pairing for
925 * Easy Unlock. 918 * Easy Unlock.
926 * @param {boolean} hasPairing True if the current profile has a pairing. 919 * @param {boolean} hasPairing True if the current profile has a pairing.
927 */ 920 */
928 updateEasyUnlock_: function(hasPairing) { 921 updateEasyUnlock_: function(hasPairing) {
929 $('easy-unlock-setup').hidden = hasPairing; 922 $('easy-unlock-setup').hidden = hasPairing;
930 $('easy-unlock-enable').hidden = !hasPairing; 923 $('easy-unlock-enable').hidden = !hasPairing;
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 BrowserOptions.getLoggedInUsername = function() { 1783 BrowserOptions.getLoggedInUsername = function() {
1791 return BrowserOptions.getInstance().username_; 1784 return BrowserOptions.getInstance().username_;
1792 }; 1785 };
1793 } 1786 }
1794 1787
1795 // Export 1788 // Export
1796 return { 1789 return {
1797 BrowserOptions: BrowserOptions 1790 BrowserOptions: BrowserOptions
1798 }; 1791 };
1799 }); 1792 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698