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

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

Issue 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 <div class="settings-row"> 150 <div class="settings-row">
151 <select id="default-search-engine" class="weakrtl" 151 <select id="default-search-engine" class="weakrtl"
152 aria-labelledby="default-search-engine-label"></select> 152 aria-labelledby="default-search-engine-label"></select>
153 <span class="controlled-setting-indicator" 153 <span class="controlled-setting-indicator"
154 pref="default_search_provider_data.template_url_data"> 154 pref="default_search_provider_data.template_url_data">
155 </span> 155 </span>
156 <button id="manage-default-search-engines" 156 <button id="manage-default-search-engines"
157 i18n-content="defaultSearchManageEngines"> 157 i18n-content="defaultSearchManageEngines">
158 </button> 158 </button>
159 </div> 159 </div>
160 <div id="google-now-launcher" hidden>
161 <div class="checkbox">
162 <label>
163 <input pref="google_now_launcher.enabled" type="checkbox">
164 <span i18n-content="googleNowLauncherEnable"></span>
165 </label>
166 </div>
167 </div>
160 <div id="hotword-always-on-search" hidden> 168 <div id="hotword-always-on-search" hidden>
161 <div class="checkbox controlled-setting-with-label"> 169 <div class="checkbox controlled-setting-with-label">
162 <label> 170 <label>
163 <input id="hotword-always-on-search-checkbox" 171 <input id="hotword-always-on-search-checkbox"
164 pref="hotword.always_on_search_enabled" type="checkbox"> 172 pref="hotword.always_on_search_enabled" type="checkbox">
165 <span i18n-content="hotwordSearchEnable"></span> 173 <span i18n-content="hotwordSearchEnable"></span>
166 </label> 174 </label>
167 <a target="_blank" class="hotword-link" 175 <a target="_blank" class="hotword-link"
168 i18n-content="learnMore" 176 i18n-content="learnMore"
169 i18n-values="href:hotwordLearnMoreURL"> 177 i18n-values="href:hotwordLearnMoreURL">
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 </button> 1023 </button>
1016 </div> 1024 </div>
1017 </section> 1025 </section>
1018 </div> <!-- advanced-settings-container --> 1026 </div> <!-- advanced-settings-container -->
1019 </div> <!-- advanced-settings --> 1027 </div> <!-- advanced-settings -->
1020 <footer id="advanced-settings-footer"> 1028 <footer id="advanced-settings-footer">
1021 <a is="action-link" id="advanced-settings-expander" 1029 <a is="action-link" id="advanced-settings-expander"
1022 i18n-content="showAdvancedSettings"></a> 1030 i18n-content="showAdvancedSettings"></a>
1023 </footer> 1031 </footer>
1024 </div> 1032 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698