chrome/browser/resources/options/browser_options.html - Issue 134103005: [Hotword] Putting preferences under search for hotword service. Putting behind a flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/options/browser_options.html

Issue 134103005: [Hotword] Putting preferences under search for hotword service. Putting behind a flag. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: add flag and cleanup Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/options/browser_options.css ('K') | « chrome/browser/resources/options/browser_options.css ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/browser_options.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/browser_options.html

diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html

index bde4c491582537b60d89a2c46ff4b0b04f42c6e6..26178e80c48b04339b1c496b0d76084a6021f1ca 100644

--- a/chrome/browser/resources/options/browser_options.html

+++ b/chrome/browser/resources/options/browser_options.html

@@ -139,6 +139,61 @@

</button>

</div>

+ <div id ="hotword-search" hidden>

+ <div class="checkbox">

+ <span class="controlled-setting-with-label">

+ <input id="hotword-search-enable" pref="hotword.search_enabled"

+ type="checkbox">

+ <span>

+ <label for="hotword-search-enable"

+ i18n-values=".innerHTML:hotwordSearchEnable">

+ </label>

+ <span class="controlled-setting-indicator"

+ pref="hotword.search_enabled">

+ </span>

+ <div id="hotword-search-description" class="hotword-settings">

+ <span i18n-content="hotwordSearchDescription"></span>

+ </div>

+ <div id="hotword-settings-section" class="hotword-settings" hidden>

+ <div id="hotword-settings-section-container">

+ <div class="checkbox">

+ <span class="controlled-setting-with-label">

+ <input id="hotword-search-timeout"

+ pref="hotword.search_timeout_enabled" type="checkbox">

+ <span>

+ <label for="hotword-search-timeout"

+ i18n-content="hotwordSearchTimeout">

+ </label>

+ <span class="controlled-setting-indicator"

+ pref="hotword.search_timeout_enabled">

+ </span>

+ <div id="hotword-search-timeout-description"

+ class="hotword-settings">

+ <span i18n-content="hotwordSearchTimeoutDescription"></span>

+ </div>

+ <div class="checkbox">

+ <span class="controlled-setting-with-label">

+ <input id="hotword-search-incognito-enable"

+ pref="hotword.incognito_search_enabled" type="checkbox">

+ <span>

+ <label for="hotword-search-incognito-enable"

+ i18n-content="hotwordSearchIncognito">

+ </label>

+ <span class="controlled-setting-indicator"

+ pref="hotword.incognito_search_enabled">

+ </span>

+ </div>

</section>