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 Page = cr.ui.pageManager.Page; | 7 var Page = cr.ui.pageManager.Page; |
8 var PageManager = cr.ui.pageManager.PageManager; | 8 var PageManager = cr.ui.pageManager.PageManager; |
9 var ArrayDataModel = cr.ui.ArrayDataModel; | 9 var ArrayDataModel = cr.ui.ArrayDataModel; |
10 var RepeatingButton = cr.ui.RepeatingButton; | 10 var RepeatingButton = cr.ui.RepeatingButton; |
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 }, | 1044 }, |
1045 | 1045 |
1046 /** | 1046 /** |
1047 * Update the UI depending on whether the current profile has a pairing for | 1047 * Update the UI depending on whether the current profile has a pairing for |
1048 * Easy Unlock. | 1048 * Easy Unlock. |
1049 * @param {boolean} hasPairing True if the current profile has a pairing. | 1049 * @param {boolean} hasPairing True if the current profile has a pairing. |
1050 */ | 1050 */ |
1051 updateEasyUnlock_: function(hasPairing) { | 1051 updateEasyUnlock_: function(hasPairing) { |
1052 $('easy-unlock-setup').hidden = hasPairing; | 1052 $('easy-unlock-setup').hidden = hasPairing; |
1053 $('easy-unlock-enable').hidden = !hasPairing; | 1053 $('easy-unlock-enable').hidden = !hasPairing; |
| 1054 if (!hasPairing && EasyUnlockTurnOffOverlay.getInstance().visible) { |
| 1055 EasyUnlockTurnOffOverlay.dismiss(); |
| 1056 } |
1054 }, | 1057 }, |
1055 | 1058 |
1056 /** | 1059 /** |
1057 * Update the UI depending on whether the current profile manages any | 1060 * Update the UI depending on whether the current profile manages any |
1058 * supervised users. | 1061 * supervised users. |
1059 * @param {boolean} show True if the current profile manages any supervised | 1062 * @param {boolean} show True if the current profile manages any supervised |
1060 * users. | 1063 * users. |
1061 */ | 1064 */ |
1062 updateManagesSupervisedUsers_: function(show) { | 1065 updateManagesSupervisedUsers_: function(show) { |
1063 $('profiles-supervised-dashboard-tip').hidden = !show; | 1066 $('profiles-supervised-dashboard-tip').hidden = !show; |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1978 BrowserOptions.getLoggedInUsername = function() { | 1981 BrowserOptions.getLoggedInUsername = function() { |
1979 return BrowserOptions.getInstance().username_; | 1982 return BrowserOptions.getInstance().username_; |
1980 }; | 1983 }; |
1981 } | 1984 } |
1982 | 1985 |
1983 // Export | 1986 // Export |
1984 return { | 1987 return { |
1985 BrowserOptions: BrowserOptions | 1988 BrowserOptions: BrowserOptions |
1986 }; | 1989 }; |
1987 }); | 1990 }); |
OLD | NEW |