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

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

Issue 460113005: Adds the audio history and always on hotwording settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Comments Created 6 years, 4 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 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 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 */ 1092 */
1093 showHotwordSection_: function(opt_enabled, opt_error) { 1093 showHotwordSection_: function(opt_enabled, opt_error) {
1094 $('voice-section-title').hidden = false; 1094 $('voice-section-title').hidden = false;
1095 $('hotword-search').hidden = false; 1095 $('hotword-search').hidden = false;
1096 $('hotword-search-setting-indicator').setError(opt_error); 1096 $('hotword-search-setting-indicator').setError(opt_error);
1097 if (opt_enabled && opt_error) 1097 if (opt_enabled && opt_error)
1098 $('hotword-search-setting-indicator').updateBasedOnError(); 1098 $('hotword-search-setting-indicator').updateBasedOnError();
1099 }, 1099 },
1100 1100
1101 /** 1101 /**
1102 * Activates the Audio History and Always-On Hotword sections from the
1103 * System settings page.
1104 * @private
1105 */
1106 showHotwordAlwaysOnSection_: function() {
1107 $('hotword-always-on-search').hidden = false;
1108 $('audio-logging').hidden = false;
1109 },
1110
1111 /**
1102 * Event listener for the 'homepage is NTP' preference. Updates the label 1112 * Event listener for the 'homepage is NTP' preference. Updates the label
1103 * next to the 'Change' button. 1113 * next to the 'Change' button.
1104 * @param {Event} event The preference change event. 1114 * @param {Event} event The preference change event.
1105 */ 1115 */
1106 onHomePageIsNtpChanged_: function(event) { 1116 onHomePageIsNtpChanged_: function(event) {
1107 if (!event.value.uncommitted) { 1117 if (!event.value.uncommitted) {
1108 $('home-page-url').hidden = event.value.value; 1118 $('home-page-url').hidden = event.value.value;
1109 $('home-page-ntp').hidden = !event.value.value; 1119 $('home-page-ntp').hidden = !event.value.value;
1110 } 1120 }
1111 }, 1121 },
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1919 'setProfilesInfo', 1929 'setProfilesInfo',
1920 'setSpokenFeedbackCheckboxState', 1930 'setSpokenFeedbackCheckboxState',
1921 'setThemesResetButtonEnabled', 1931 'setThemesResetButtonEnabled',
1922 'setVirtualKeyboardCheckboxState', 1932 'setVirtualKeyboardCheckboxState',
1923 'setupPageZoomSelector', 1933 'setupPageZoomSelector',
1924 'setupProxySettingsButton', 1934 'setupProxySettingsButton',
1925 'showBluetoothSettings', 1935 'showBluetoothSettings',
1926 'showCreateProfileError', 1936 'showCreateProfileError',
1927 'showCreateProfileSuccess', 1937 'showCreateProfileSuccess',
1928 'showCreateProfileWarning', 1938 'showCreateProfileWarning',
1939 'showHotwordAlwaysOnSection',
1929 'showHotwordSection', 1940 'showHotwordSection',
1930 'showMouseControls', 1941 'showMouseControls',
1931 'showSupervisedUserImportError', 1942 'showSupervisedUserImportError',
1932 'showSupervisedUserImportSuccess', 1943 'showSupervisedUserImportSuccess',
1933 'showTouchpadControls', 1944 'showTouchpadControls',
1934 'toggleExtensionIndicators', 1945 'toggleExtensionIndicators',
1935 'updateAccountPicture', 1946 'updateAccountPicture',
1936 'updateAutoLaunchState', 1947 'updateAutoLaunchState',
1937 'updateDefaultBrowserState', 1948 'updateDefaultBrowserState',
1938 'updateEasyUnlock', 1949 'updateEasyUnlock',
(...skipping 17 matching lines...) Expand all
1956 BrowserOptions.getLoggedInUsername = function() { 1967 BrowserOptions.getLoggedInUsername = function() {
1957 return BrowserOptions.getInstance().username_; 1968 return BrowserOptions.getInstance().username_;
1958 }; 1969 };
1959 } 1970 }
1960 1971
1961 // Export 1972 // Export
1962 return { 1973 return {
1963 BrowserOptions: BrowserOptions 1974 BrowserOptions: BrowserOptions
1964 }; 1975 };
1965 }); 1976 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/search/hotword_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698