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

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

Issue 523573004: Moves the hotwording checkbox back to the 'Privacy' section. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 </header> 4 </header>
5 <include src="automatic_settings_reset_banner.html"> 5 <include src="automatic_settings_reset_banner.html">
6 <if expr="chromeos"> 6 <if expr="chromeos">
7 <include src="secondary_user_banner.html"> 7 <include src="secondary_user_banner.html">
8 <section> 8 <section>
9 <div id="network-section-header" class="section-header"> 9 <div id="network-section-header" class="section-header">
10 <h3 i18n-content="sectionTitleInternet"></h3> 10 <h3 i18n-content="sectionTitleInternet"></h3>
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 </span> 147 </span>
148 <button id="manage-default-search-engines" 148 <button id="manage-default-search-engines"
149 i18n-content="defaultSearchManageEngines"> 149 i18n-content="defaultSearchManageEngines">
150 </button> 150 </button>
151 </div> 151 </div>
152 </div> 152 </div>
153 </section> 153 </section>
154 <section> 154 <section>
155 <h3 id="voice-section-title" i18n-content="sectionTitleVoice" hidden></h3> 155 <h3 id="voice-section-title" i18n-content="sectionTitleVoice" hidden></h3>
156 <div id="voice-section-content"> 156 <div id="voice-section-content">
157 <div id="hotword-search" hidden>
158 <div class="checkbox">
159 <span class="controlled-setting-with-label">
160 <input id="hotword-search-enable" pref="hotword.search_enabled_2"
161 metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
162 <span>
163 <label for="hotword-search-enable"
164 i18n-values=".innerHTML:hotwordSearchEnable">
165 </label>
166 <span id="hotword-search-setting-indicator"
167 pref="hotword.search_enabled_2" dialog-pref>
168 </span>
169 </span>
170 </span>
171 </div>
172 </div>
173 <div id="hotword-always-on-search" hidden> 157 <div id="hotword-always-on-search" hidden>
174 <div class="checkbox"> 158 <div class="checkbox">
175 <span class="controlled-setting-with-label"> 159 <span class="controlled-setting-with-label">
176 <input id="hotword-always-on-search-enable" 160 <input id="hotword-always-on-search-enable"
177 pref="hotword.always_on_search_enabled" type="checkbox"> 161 pref="hotword.always_on_search_enabled" type="checkbox">
178 <span> 162 <span>
179 <label for="hotword-always-on-search-enable" 163 <label for="hotword-always-on-search-enable"
180 i18n-content="hotwordAlwaysOnSearchEnable"> 164 i18n-content="hotwordAlwaysOnSearchEnable">
181 </label> 165 </label>
182 </span> 166 </span>
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 <a target="_blank" i18n-content="learnMore" 430 <a target="_blank" i18n-content="learnMore"
447 i18n-values="href:contentProtectionAttestationLearnMoreURL"> 431 i18n-values="href:contentProtectionAttestationLearnMoreURL">
448 </a> 432 </a>
449 <span class="controlled-setting-indicator" 433 <span class="controlled-setting-indicator"
450 pref="cros.device.attestation_for_content_protection_enabled"> 434 pref="cros.device.attestation_for_content_protection_enabled">
451 </span> 435 </span>
452 </span> 436 </span>
453 </span> 437 </span>
454 </div> 438 </div>
455 </if> 439 </if>
440 <div id="hotword-search" hidden>
441 <div class="checkbox">
442 <span class="controlled-setting-with-label">
443 <input id="hotword-search-enable" pref="hotword.search_enabled_2"
444 metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
445 <span>
446 <label for="hotword-search-enable"
447 i18n-values=".innerHTML:hotwordSearchEnable">
448 </label>
449 <span id="hotword-search-setting-indicator"
450 pref="hotword.search_enabled_2" dialog-pref>
451 </span>
452 </span>
453 </span>
454 </div>
455 </div>
456 </div> 456 </div>
457 </section> 457 </section>
458 <if expr="chromeos"> 458 <if expr="chromeos">
459 <!-- By default, the bluetooth section is hidden. It is only visible if a 459 <!-- By default, the bluetooth section is hidden. It is only visible if a
460 bluetooth adapter is discovered --> 460 bluetooth adapter is discovered -->
461 <section id="bluetooth-devices" hidden> 461 <section id="bluetooth-devices" hidden>
462 <h3 i18n-content="bluetooth"></h3> 462 <h3 i18n-content="bluetooth"></h3>
463 <div id="bluetooth-options-div"> 463 <div id="bluetooth-options-div">
464 <div class="checkbox"> 464 <div class="checkbox">
465 <label> 465 <label>
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 <button id="advanced-settings-expander" class="link-button" 976 <button id="advanced-settings-expander" class="link-button"
977 i18n-content="showAdvancedSettings"> 977 i18n-content="showAdvancedSettings">
978 </button> 978 </button>
979 <if expr="chromeos"> 979 <if expr="chromeos">
980 <button id="version-button" class="link-button" hidden 980 <button id="version-button" class="link-button" hidden
981 i18n-content="browserVersion"> 981 i18n-content="browserVersion">
982 </button> 982 </button>
983 </if> 983 </if>
984 </footer> 984 </footer>
985 </div> 985 </div>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698