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

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

Issue 677843002: Updates the hotword settings page according to newest mocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <include src="automatic_settings_reset_banner.html"> 6 <include src="automatic_settings_reset_banner.html">
7 <if expr="chromeos"> 7 <if expr="chromeos">
8 <include src="secondary_user_banner.html"> 8 <include src="secondary_user_banner.html">
9 <section> 9 <section>
10 <div id="network-section-header" class="section-header"> 10 <div id="network-section-header" class="section-header">
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 <div class="settings-row"> 144 <div class="settings-row">
145 <select id="default-search-engine" class="weakrtl" 145 <select id="default-search-engine" class="weakrtl"
146 aria-labelledby="default-search-engine-label"></select> 146 aria-labelledby="default-search-engine-label"></select>
147 <span class="controlled-setting-indicator" 147 <span class="controlled-setting-indicator"
148 pref="default_search_provider_data.template_url_data"> 148 pref="default_search_provider_data.template_url_data">
149 </span> 149 </span>
150 <button id="manage-default-search-engines" 150 <button id="manage-default-search-engines"
151 i18n-content="defaultSearchManageEngines"> 151 i18n-content="defaultSearchManageEngines">
152 </button> 152 </button>
153 </div> 153 </div>
154 </div> 154 <div id="hotword-always-on-search" hidden>
155 </section> 155 <div class="checkbox controlled-setting-with-label">
156 <section> 156 <label>
157 <h3 id="voice-section-title" i18n-content="sectionTitleVoice" hidden></h3> 157 <input id="hotword-always-on-search-checkbox"
158 <div id="voice-section-content"> 158 pref="hotword.always_on_search_enabled" type="checkbox">
159 <div id="hotword-always-on-search" hidden> 159 <span i18n-content="hotwordSearchEnable"></span>
160 <div class="checkbox controlled-setting-with-label"> 160 </label>
161 <label> 161 <a target="_blank" class="hotword-learn-more-link"
162 <input id="hotword-always-on-search-checkbox" 162 i18n-content="learnMore"
163 pref="hotword.always_on_search_enabled" type="checkbox"> 163 i18n-values="href:hotwordLearnMoreURL"></a>
164 <span i18n-content="hotwordAlwaysOnSearchEnable"></span> 164 <br>
James Hawkins 2014/10/28 22:42:55 Why is this <br> being used?
kcarattini 2014/10/28 23:22:51 Done.
165 </label> 165 <span class="hotword-description"
166 i18n-content="hotwordAlwaysOnDesc"></span>
167 </div>
168 </div>
169 <div id="hotword-no-dsp-search" hidden>
170 <div class="checkbox controlled-setting-with-label">
171 <label>
172 <input id="hotword-no-dsp-search-checkbox"
173 pref="hotword.search_enabled_2" type="checkbox">
174 <span i18n-content="hotwordSearchEnable"></span>
175 </label>
176 <a target="_blank" class="hotword-learn-more-link"
177 i18n-content="learnMore"
178 i18n-values="href:hotwordLearnMoreURL"></a>
179 <br>
180 <span class="hotword-description"
181 i18n-content="hotwordNoDSPDesc"></span>
182 </div>
183 </div>
184 <div id="audio-logging" hidden>
185 <div class="checkbox controlled-setting-with-label">
186 <label>
187 <input pref="hotword.audio_logging_enabled" type="checkbox">
188 <span i18n-content="hotwordAudioHistoryEnable"></span>
189 </label>
190 </div>
166 </div> 191 </div>
167 </div> 192 </div>
168 <div id="audio-logging" hidden>
169 <div class="checkbox controlled-setting-with-label">
170 <label>
171 <input pref="hotword.audio_logging_enabled" type="checkbox">
172 <span i18n-content="hotwordAudioHistoryEnable"></span>
173 </label>
174 </div>
175 </div>
176 </div>
177 </section> 193 </section>
178 <section id="sync-users-section" guest-visibility="hidden"> 194 <section id="sync-users-section" guest-visibility="hidden">
179 <h3 i18n-content="sectionTitleUsers"></h3> 195 <h3 i18n-content="sectionTitleUsers"></h3>
180 <if expr="chromeos"> 196 <if expr="chromeos">
181 <include src="sync_section.html"> 197 <include src="sync_section.html">
182 </if> 198 </if>
183 <div id="profiles-section" hidden> 199 <div id="profiles-section" hidden>
184 <list id="profiles-list" class="settings-list" hidden></list> 200 <list id="profiles-list" class="settings-list" hidden></list>
185 <div id="profiles-single-message" class="settings-row" 201 <div id="profiles-single-message" class="settings-row"
186 i18n-content="profilesSingleUser"> 202 i18n-content="profilesSingleUser">
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 </button> 941 </button>
926 </div> 942 </div>
927 </section> 943 </section>
928 </div> <!-- advanced-settings-container --> 944 </div> <!-- advanced-settings-container -->
929 </div> <!-- advanced-settings --> 945 </div> <!-- advanced-settings -->
930 <footer> 946 <footer>
931 <a is="action-link" id="advanced-settings-expander" 947 <a is="action-link" id="advanced-settings-expander"
932 i18n-content="showAdvancedSettings"></a> 948 i18n-content="showAdvancedSettings"></a>
933 </footer> 949 </footer>
934 </div> 950 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698