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

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

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 Comment Modifications 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 <label for="hotword-search-enable" 163 <label for="hotword-search-enable"
164 i18n-values=".innerHTML:hotwordSearchEnable"> 164 i18n-values=".innerHTML:hotwordSearchEnable">
165 </label> 165 </label>
166 <span id="hotword-search-setting-indicator" 166 <span id="hotword-search-setting-indicator"
167 pref="hotword.search_enabled_2" dialog-pref> 167 pref="hotword.search_enabled_2" dialog-pref>
168 </span> 168 </span>
169 </span> 169 </span>
170 </span> 170 </span>
171 </div> 171 </div>
172 </div> 172 </div>
173 <div id="hotword-always-on-search" hidden>
174 <div class="checkbox">
175 <span class="controlled-setting-with-label">
176 <input id="hotword-always-on-search-enable"
177 pref="hotword.always_on_search_enabled"
178 type="checkbox">
179 <span>
180 <label for="hotword-always-on-search-enable"
181 i18n-content="hotwordAlwaysOnSearchEnable">
182 </label>
183 </span>
184 </span>
185 </div>
186 </div>
187 <div id="audio-logging" hidden>
188 <div class="checkbox">
189 <span class="controlled-setting-with-label">
190 <input id="audio-logging-enable"
191 pref="hotword.audio_logging_enabled"
192 type="checkbox">
Matt Giuca 2014/08/13 05:21:09 nit: this got indented 3 spaces unnecessarily.
kcarattini 2014/08/13 05:34:33 Done.
193 <span>
194 <label for="audio-logging-enable"
195 i18n-content="hotwordAudioHistoryEnable">
196 </label>
197 </span>
198 </span>
199 </div>
200 </div>
173 </div> 201 </div>
174 </section> 202 </section>
175 <section id="sync-users-section" guest-visibility="hidden"> 203 <section id="sync-users-section" guest-visibility="hidden">
176 <h3 i18n-content="sectionTitleUsers"></h3> 204 <h3 i18n-content="sectionTitleUsers"></h3>
177 <if expr="chromeos"> 205 <if expr="chromeos">
178 <include src="sync_section.html"> 206 <include src="sync_section.html">
179 </if> 207 </if>
180 <div id="profiles-section" hidden> 208 <div id="profiles-section" hidden>
181 <list id="profiles-list" class="settings-list" hidden></list> 209 <list id="profiles-list" class="settings-list" hidden></list>
182 <div id="profiles-single-message" class="settings-row" 210 <div id="profiles-single-message" class="settings-row"
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 </div> 973 </div>
946 </section> 974 </section>
947 </div> <!-- advanced-settings-container --> 975 </div> <!-- advanced-settings-container -->
948 </div> <!-- advanced-settings --> 976 </div> <!-- advanced-settings -->
949 <footer> 977 <footer>
950 <button id="advanced-settings-expander" class="link-button" 978 <button id="advanced-settings-expander" class="link-button"
951 i18n-content="showAdvancedSettings"> 979 i18n-content="showAdvancedSettings">
952 </button> 980 </button>
953 </footer> 981 </footer>
954 </div> 982 </div>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698