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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 136693013: [Hotword] Remove unneeded preferences. Cleaning up look of settings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: adding missing overlay files Created 6 years, 10 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 | « chrome/browser/resources/options/browser_options.css ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/hotword_confirm_overlay.html » ('J')
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="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <if expr="not pp_ifdef('chromeos')"> 6 <if expr="not pp_ifdef('chromeos')">
7 <include src="sync_section.html"> 7 <include src="sync_section.html">
8 </if> 8 </if>
9 <if expr="pp_ifdef('chromeos')"> 9 <if expr="pp_ifdef('chromeos')">
10 <section> 10 <section>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 <div class="settings-row"> 132 <div class="settings-row">
133 <select id="default-search-engine" class="weakrtl"></select> 133 <select id="default-search-engine" class="weakrtl"></select>
134 <span class="controlled-setting-indicator" 134 <span class="controlled-setting-indicator"
135 pref="default_search_provider.enabled"> 135 pref="default_search_provider.enabled">
136 </span> 136 </span>
137 <button id="manage-default-search-engines" 137 <button id="manage-default-search-engines"
138 i18n-content="defaultSearchManageEngines"> 138 i18n-content="defaultSearchManageEngines">
139 </button> 139 </button>
140 </div> 140 </div>
141 </div> 141 </div>
142 <div id ="hotword-search" hidden>
143 <div class="checkbox">
144 <span class="controlled-setting-with-label">
145 <input id="hotword-search-enable" pref="hotword.search_enabled"
146 type="checkbox">
147 <span>
148 <label for="hotword-search-enable"
149 i18n-values=".innerHTML:hotwordSearchEnable">
150 </label>
151 <span class="controlled-setting-indicator"
152 pref="hotword.search_enabled">
153 </span>
154 </span>
155 </span>
156 <div id="hotword-search-description" class="hotword-settings">
157 <span i18n-content="hotwordSearchDescription"></span>
158 </div>
159 </div>
160 <div id="hotword-settings-section" class="hotword-settings" hidden>
161 <div id="hotword-settings-section-container">
162 <div class="checkbox">
163 <span class="controlled-setting-with-label">
164 <input id="hotword-search-timeout"
165 pref="hotword.search_timeout_enabled" type="checkbox">
166 <span>
167 <label for="hotword-search-timeout"
168 i18n-content="hotwordSearchTimeout">
169 </label>
170 <span class="controlled-setting-indicator"
171 pref="hotword.search_timeout_enabled">
172 </span>
173 </span>
174 </span>
175 <div id="hotword-search-timeout-description"
176 class="hotword-settings">
177 <span i18n-content="hotwordSearchTimeoutDescription"></span>
178 </div>
179 </div>
180 <div class="checkbox">
181 <span class="controlled-setting-with-label">
182 <input id="hotword-search-incognito-enable"
183 pref="hotword.incognito_search_enabled" type="checkbox">
184 <span>
185 <label for="hotword-search-incognito-enable"
186 i18n-content="hotwordSearchIncognito">
187 </label>
188 <span class="controlled-setting-indicator"
189 pref="hotword.incognito_search_enabled">
190 </span>
191 </span>
192 </span>
193 </div>
194 </div>
195 </div>
196 </div>
197 </section> 142 </section>
198 <section id="sync-users-section" guest-visibility="hidden"> 143 <section id="sync-users-section" guest-visibility="hidden">
199 <h3 i18n-content="sectionTitleUsers"></h3> 144 <h3 i18n-content="sectionTitleUsers"></h3>
200 <if expr="pp_ifdef('chromeos')"> 145 <if expr="pp_ifdef('chromeos')">
201 <include src="sync_section.html"> 146 <include src="sync_section.html">
202 </if> 147 </if>
203 <div id="profiles-section" hidden> 148 <div id="profiles-section" hidden>
204 <list id="profiles-list" class="settings-list" hidden></list> 149 <list id="profiles-list" class="settings-list" hidden></list>
205 <div id="profiles-single-message" class="settings-row" 150 <div id="profiles-single-message" class="settings-row"
206 i18n-content="profilesSingleUser"> 151 i18n-content="profilesSingleUser">
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 <a target="_blank" i18n-content="learnMore" 345 <a target="_blank" i18n-content="learnMore"
401 i18n-values="href:contentProtectionAttestationLearnMoreURL"> 346 i18n-values="href:contentProtectionAttestationLearnMoreURL">
402 </a> 347 </a>
403 <span class="controlled-setting-indicator" 348 <span class="controlled-setting-indicator"
404 pref="cros.device.attestation_for_content_protection_enabled"> 349 pref="cros.device.attestation_for_content_protection_enabled">
405 </span> 350 </span>
406 </span> 351 </span>
407 </span> 352 </span>
408 </div> 353 </div>
409 </if> 354 </if>
355 <div id ="hotword-search" hidden>
356 <div class="checkbox">
357 <span class="controlled-setting-with-label">
358 <input id="hotword-search-enable" pref="hotword.search_enabled"
359 type="checkbox" dialog-pref>
360 <span>
361 <label for="hotword-search-enable"
362 i18n-values=".innerHTML:hotwordSearchEnable">
363 </label>
364 <span class="controlled-setting-indicator"
365 pref="hotword.search_enabled" dialog-pref>
366 </span>
367 </span>
368 </span>
369 </div>
370 </div>
410 </div> 371 </div>
411 </section> 372 </section>
412 <if expr="pp_ifdef('chromeos')"> 373 <if expr="pp_ifdef('chromeos')">
413 <!-- By default, the bluetooth section is hidden. It is only visible if a 374 <!-- By default, the bluetooth section is hidden. It is only visible if a
414 bluetooth adapter is discovered --> 375 bluetooth adapter is discovered -->
415 <section id="bluetooth-devices" hidden> 376 <section id="bluetooth-devices" hidden>
416 <h3 i18n-content="bluetooth"></h3> 377 <h3 i18n-content="bluetooth"></h3>
417 <div id="bluetooth-options-div"> 378 <div id="bluetooth-options-div">
418 <div class="checkbox"> 379 <div class="checkbox">
419 <label> 380 <label>
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 </div> 874 </div>
914 </section> 875 </section>
915 </div> <!-- advanced-settings-container --> 876 </div> <!-- advanced-settings-container -->
916 </div> <!-- advanced-settings --> 877 </div> <!-- advanced-settings -->
917 <footer> 878 <footer>
918 <button id="advanced-settings-expander" class="link-button" 879 <button id="advanced-settings-expander" class="link-button"
919 i18n-content="showAdvancedSettings"> 880 i18n-content="showAdvancedSettings">
920 </button> 881 </button>
921 </footer> 882 </footer>
922 </div> 883 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.css ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/hotword_confirm_overlay.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698