| Index: chrome/browser/resources/settings/search_page/search_page.js
|
| diff --git a/chrome/browser/resources/settings/search_page/search_page.js b/chrome/browser/resources/settings/search_page/search_page.js
|
| index 54d2e8349782ca1349e281c8e34c30151e1f338b..6719a4ded9da3c4571ba5dc0e4a0d08b1d768ace 100644
|
| --- a/chrome/browser/resources/settings/search_page/search_page.js
|
| +++ b/chrome/browser/resources/settings/search_page/search_page.js
|
| @@ -42,6 +42,17 @@ Polymer({
|
|
|
| /** @type {?Map<string, string>} */
|
| focusConfig_: Object,
|
| +
|
| + // <if expr="chromeos">
|
| + /** @private */
|
| + voiceInteractionFeatureEnabled_: {
|
| + type: Boolean,
|
| + notify: true,
|
| + value: function() {
|
| + return loadTimeData.getBoolean('enableVoiceInteraction');
|
| + },
|
| + }
|
| + // </if>
|
| },
|
|
|
| /** @private {?settings.SearchEnginesBrowserProxy} */
|
| @@ -99,6 +110,11 @@ Polymer({
|
| settings.navigateTo(settings.routes.SEARCH_ENGINES);
|
| },
|
|
|
| + /** @private */
|
| + onGoogleAssistantTap_: function() {
|
| + settings.navigateTo(settings.routes.GOOGLE_ASSISTANT);
|
| + },
|
| +
|
| /**
|
| * @param {!Event} event
|
| * @private
|
| @@ -169,6 +185,18 @@ Polymer({
|
| this.browserProxy_.setHotwordSearchEnabled(this.hotwordInfo_.enabled);
|
| },
|
|
|
| +// <if expr="chromeos">
|
| + /**
|
| + * @param {boolean} assistantEnabled
|
| + * @return {boolean}
|
| + * @private
|
| + */
|
| + getAssistantEnabledDisabledLabel_: function(toggleValue) {
|
| + return this.i18n(toggleValue ? 'searchGoogleAssistantEnabled' :
|
| + 'searchGoogleAssistantDisabled');
|
| + },
|
| +// </if>
|
| +
|
| /**
|
| * @param {!Event} event
|
| * @private
|
|
|