| OLD | NEW |
| 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 <if expr="not pp_ifdef('chromeos')"> | 5 <if expr="not pp_ifdef('chromeos')"> |
| 6 <include src="sync_section.html"> | 6 <include src="sync_section.html"> |
| 7 </if> | 7 </if> |
| 8 <if expr="pp_ifdef('chromeos')"> | 8 <if expr="pp_ifdef('chromeos')"> |
| 9 <section> | 9 <section> |
| 10 <h3 i18n-content="sectionTitleInternet"></h3> | 10 <h3 i18n-content="sectionTitleInternet"></h3> |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 pref="default_search_provider.enabled"> | 129 pref="default_search_provider.enabled"> |
| 130 </span> | 130 </span> |
| 131 <button id="manage-default-search-engines" | 131 <button id="manage-default-search-engines" |
| 132 i18n-content="defaultSearchManageEngines"> | 132 i18n-content="defaultSearchManageEngines"> |
| 133 </button> | 133 </button> |
| 134 </div> | 134 </div> |
| 135 <div class="checkbox" guest-visibility="disabled"> | 135 <div class="checkbox" guest-visibility="disabled"> |
| 136 <label id="instant-label"> | 136 <label id="instant-label"> |
| 137 <!-- TODO(estade): metric? --> | 137 <!-- TODO(estade): metric? --> |
| 138 <input id="instant-enabled-control" type="checkbox" | 138 <input id="instant-enabled-control" type="checkbox" |
| 139 pref="instant.enabled"> | 139 pref="instant.enabled" dialog-pref> |
| 140 <!-- TODO(estade) There's a link in here which should not be inside | 140 <!-- TODO(estade) There's a link in here which should not be inside |
| 141 a <label>. --> | 141 a <label>. --> |
| 142 <span i18n-values=".innerHTML:instantPrefAndWarning"></span> | 142 <span i18n-values=".innerHTML:instantPrefAndWarning"></span> |
| 143 </label> | 143 </label> |
| 144 </div> | 144 </div> |
| 145 </div> | 145 </div> |
| 146 </section> | 146 </section> |
| 147 <section guest-visibility="hidden"> | 147 <section guest-visibility="hidden"> |
| 148 <h3 i18n-content="sectionTitleUsers"></h3> | 148 <h3 i18n-content="sectionTitleUsers"></h3> |
| 149 <if expr="pp_ifdef('chromeos')"> | 149 <if expr="pp_ifdef('chromeos')"> |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 <span class="controlled-setting-indicator" | 276 <span class="controlled-setting-indicator" |
| 277 pref="safebrowsing.enabled"> | 277 pref="safebrowsing.enabled"> |
| 278 </span> | 278 </span> |
| 279 </span> | 279 </span> |
| 280 </span> | 280 </span> |
| 281 </div> | 281 </div> |
| 282 <if expr="pp_ifdef('_google_chrome')"> | 282 <if expr="pp_ifdef('_google_chrome')"> |
| 283 <div class="checkbox"> | 283 <div class="checkbox"> |
| 284 <label id="spelling-label"> | 284 <label id="spelling-label"> |
| 285 <input id="spelling-enabled-control" type="checkbox" | 285 <input id="spelling-enabled-control" type="checkbox" |
| 286 pref="spellcheck.use_spelling_service"> | 286 pref="spellcheck.use_spelling_service" dialog-pref> |
| 287 <span i18n-content="spellingPref"></span> | 287 <span i18n-content="spellingPref"></span> |
| 288 </label> | 288 </label> |
| 289 </div> | 289 </div> |
| 290 <div id="metricsReportingSetting" class="checkbox"> | 290 <div id="metricsReportingSetting" class="checkbox"> |
| 291 <span class="controlled-setting-with-label"> | 291 <span class="controlled-setting-with-label"> |
| 292 <if expr="pp_ifdef('chromeos')"> | 292 <if expr="pp_ifdef('chromeos')"> |
| 293 <input id="metricsReportingEnabled" | 293 <input id="metricsReportingEnabled" |
| 294 pref="cros.metrics.reportingEnabled" type="checkbox"> | 294 pref="cros.metrics.reportingEnabled" type="checkbox"> |
| 295 </if> | 295 </if> |
| 296 <if expr="not pp_ifdef('chromeos')"> | 296 <if expr="not pp_ifdef('chromeos')"> |
| 297 <input id="metricsReportingEnabled" | 297 <input id="metricsReportingEnabled" |
| 298 pref="user_experience_metrics.reporting_enabled" type="checkbox"> | 298 pref="user_experience_metrics.reporting_enabled" type="checkbox"> |
| 299 </if> | 299 </if> |
| 300 <span> | 300 <span> |
| 301 <label for="metricsReportingEnabled" i18n-content="enableLogging"> | 301 <label for="metricsReportingEnabled" i18n-content="enableLogging"> |
| 302 </label> | 302 </label> |
| 303 <span class="controlled-setting-indicator" | 303 <span class="controlled-setting-indicator" |
| 304 pref="user_experience_metrics.reporting_enabled"> | 304 pref="user_experience_metrics.reporting_enabled"> |
| 305 </span> | 305 </span> |
| 306 </span> | 306 </span> |
| 307 </span> | 307 </span> |
| 308 </div> | 308 </div> |
| 309 </if> <!-- pp_ifdef('_google_chrome') --> | 309 </if> <!-- pp_ifdef('_google_chrome') --> |
| 310 <div class="checkbox"> | 310 <div class="checkbox"> |
| 311 <label> | 311 <label> |
| 312 <input id="do-not-track-enabled" pref="enable_do_not_track" | 312 <input id="do-not-track-enabled" pref="enable_do_not_track" |
| 313 metric="Options_DoNotTrackCheckbox" type="checkbox"> | 313 metric="Options_DoNotTrackCheckbox" type="checkbox" dialog-pref> |
| 314 <span i18n-content="doNotTrack"></span> | 314 <span i18n-content="doNotTrack"></span> |
| 315 </label> | 315 </label> |
| 316 </div> | 316 </div> |
| 317 </div> | 317 </div> |
| 318 </section> | 318 </section> |
| 319 <if expr="pp_ifdef('chromeos')"> | 319 <if expr="pp_ifdef('chromeos')"> |
| 320 <!-- By default, the bluetooth section is hidden. It is only visible if a | 320 <!-- By default, the bluetooth section is hidden. It is only visible if a |
| 321 bluetooth adapter is discovered --> | 321 bluetooth adapter is discovered --> |
| 322 <section id="bluetooth-devices" hidden> | 322 <section id="bluetooth-devices" hidden> |
| 323 <h3 i18n-content="bluetooth"></h3> | 323 <h3 i18n-content="bluetooth"></h3> |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 </section> | 619 </section> |
| 620 </if> | 620 </if> |
| 621 </div> <!-- advanced-settings-container --> | 621 </div> <!-- advanced-settings-container --> |
| 622 </div> <!-- advanced-settings --> | 622 </div> <!-- advanced-settings --> |
| 623 <footer> | 623 <footer> |
| 624 <button id="advanced-settings-expander" class="link-button" | 624 <button id="advanced-settings-expander" class="link-button" |
| 625 i18n-content="showAdvancedSettings"> | 625 i18n-content="showAdvancedSettings"> |
| 626 </button> | 626 </button> |
| 627 </footer> | 627 </footer> |
| 628 </div> | 628 </div> |
| OLD | NEW |