| 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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 } | 1093 } |
| 1094 }, | 1094 }, |
| 1095 | 1095 |
| 1096 /** | 1096 /** |
| 1097 * Activates the Hotword section from the System settings page. | 1097 * Activates the Hotword section from the System settings page. |
| 1098 * @param {boolean} opt_enabled Current preference state for hotwording. | 1098 * @param {boolean} opt_enabled Current preference state for hotwording. |
| 1099 * @param {string} opt_error The error message to display. | 1099 * @param {string} opt_error The error message to display. |
| 1100 * @private | 1100 * @private |
| 1101 */ | 1101 */ |
| 1102 showHotwordSection_: function(opt_enabled, opt_error) { | 1102 showHotwordSection_: function(opt_enabled, opt_error) { |
| 1103 $('voice-section-title').hidden = false; | |
| 1104 $('hotword-search').hidden = false; | 1103 $('hotword-search').hidden = false; |
| 1105 $('hotword-search-setting-indicator').setError(opt_error); | 1104 $('hotword-search-setting-indicator').setError(opt_error); |
| 1106 if (opt_enabled && opt_error) | 1105 if (opt_enabled && opt_error) |
| 1107 $('hotword-search-setting-indicator').updateBasedOnError(); | 1106 $('hotword-search-setting-indicator').updateBasedOnError(); |
| 1108 }, | 1107 }, |
| 1109 | 1108 |
| 1110 /** | 1109 /** |
| 1111 * Activates the Audio History and Always-On Hotword sections from the | 1110 * Activates the Audio History and Always-On Hotword sections from the |
| 1112 * System settings page. | 1111 * System settings page. |
| 1113 * @private | 1112 * @private |
| 1114 */ | 1113 */ |
| 1115 showHotwordAlwaysOnSection_: function() { | 1114 showHotwordAlwaysOnSection_: function() { |
| 1115 $('voice-section-title').hidden = false; |
| 1116 $('hotword-always-on-search').hidden = false; | 1116 $('hotword-always-on-search').hidden = false; |
| 1117 $('audio-logging').hidden = false; | 1117 $('audio-logging').hidden = false; |
| 1118 }, | 1118 }, |
| 1119 | 1119 |
| 1120 /** | 1120 /** |
| 1121 * Event listener for the 'homepage is NTP' preference. Updates the label | 1121 * Event listener for the 'homepage is NTP' preference. Updates the label |
| 1122 * next to the 'Change' button. | 1122 * next to the 'Change' button. |
| 1123 * @param {Event} event The preference change event. | 1123 * @param {Event} event The preference change event. |
| 1124 */ | 1124 */ |
| 1125 onHomePageIsNtpChanged_: function(event) { | 1125 onHomePageIsNtpChanged_: function(event) { |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1978 BrowserOptions.getLoggedInUsername = function() { | 1978 BrowserOptions.getLoggedInUsername = function() { |
| 1979 return BrowserOptions.getInstance().username_; | 1979 return BrowserOptions.getInstance().username_; |
| 1980 }; | 1980 }; |
| 1981 } | 1981 } |
| 1982 | 1982 |
| 1983 // Export | 1983 // Export |
| 1984 return { | 1984 return { |
| 1985 BrowserOptions: BrowserOptions | 1985 BrowserOptions: BrowserOptions |
| 1986 }; | 1986 }; |
| 1987 }); | 1987 }); |
| OLD | NEW |