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

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: fixed errors 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
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>
Matt Giuca 2014/08/12 08:37:39 These do not have the logic we discussed where the
kcarattini 2014/08/13 03:51:53 This is just adding the pref and checkbox. Disabli
Matt Giuca 2014/08/13 05:21:09 Acknowledged.
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 <div>
181 <div>
182 <label for="hotword-always-on-search-enable"
Matt Giuca 2014/08/12 08:37:39 Having two labels for a checkbox feels weird. I th
kcarattini 2014/08/13 03:51:53 Done.
183 i18n-content="hotwordAlwaysOnSearchEnable">
184 </label>
185 </div>
186 <div>
187 <label for="hotword-always-on-search-enable"
188 i18n-content="hotwordAlwaysOnSearchDescription">
189 </label>
190 </div>
191 </div>
192 </span>
193 </span>
194 </div>
195 </div>
196 <div id="audio-logging" hidden>
197 <div class="checkbox">
198 <span class="controlled-setting-with-label">
199 <input id="audio-logging-enable"
200 pref="hotword.audio_logging_enabled"
201 type="checkbox">
202 <span>
203 <div>
204 <div>
205 <label for="audio-logging-enable"
206 i18n-content="hotwordAudioHistoryEnable">
207 </label>
208 </div>
209 <div>
210 <label for="audio-logging-enable"
211 i18n-content="hotwordAudioHistoryDescription">
212 </label>
213 </div>
214 </div>
215 </span>
216 </span>
217 </div>
218 </div>
173 </div> 219 </div>
174 </section> 220 </section>
175 <section id="sync-users-section" guest-visibility="hidden"> 221 <section id="sync-users-section" guest-visibility="hidden">
176 <h3 i18n-content="sectionTitleUsers"></h3> 222 <h3 i18n-content="sectionTitleUsers"></h3>
177 <if expr="chromeos"> 223 <if expr="chromeos">
178 <include src="sync_section.html"> 224 <include src="sync_section.html">
179 </if> 225 </if>
180 <div id="profiles-section" hidden> 226 <div id="profiles-section" hidden>
181 <list id="profiles-list" class="settings-list" hidden></list> 227 <list id="profiles-list" class="settings-list" hidden></list>
182 <div id="profiles-single-message" class="settings-row" 228 <div id="profiles-single-message" class="settings-row"
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 </div> 991 </div>
946 </section> 992 </section>
947 </div> <!-- advanced-settings-container --> 993 </div> <!-- advanced-settings-container -->
948 </div> <!-- advanced-settings --> 994 </div> <!-- advanced-settings -->
949 <footer> 995 <footer>
950 <button id="advanced-settings-expander" class="link-button" 996 <button id="advanced-settings-expander" class="link-button"
951 i18n-content="showAdvancedSettings"> 997 i18n-content="showAdvancedSettings">
952 </button> 998 </button>
953 </footer> 999 </footer>
954 </div> 1000 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698