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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11276006: Add Chrome OS-specific controlled setting indicators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark DeviceMetricsReporting policy as official only. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/policy/policy_prefs_browsertest.cc ('k') | chrome/browser/resources/options/chromeos/accounts_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 <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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 pref="spellcheck.use_spelling_service" dialog-pref> 310 pref="spellcheck.use_spelling_service" dialog-pref>
311 </span> 311 </span>
312 </span> 312 </span>
313 </span> 313 </span>
314 </div> 314 </div>
315 <div id="metricsReportingSetting" class="checkbox"> 315 <div id="metricsReportingSetting" class="checkbox">
316 <span class="controlled-setting-with-label"> 316 <span class="controlled-setting-with-label">
317 <if expr="pp_ifdef('chromeos')"> 317 <if expr="pp_ifdef('chromeos')">
318 <input id="metricsReportingEnabled" 318 <input id="metricsReportingEnabled"
319 pref="cros.metrics.reportingEnabled" type="checkbox"> 319 pref="cros.metrics.reportingEnabled" type="checkbox">
320 <span>
321 <label for="metricsReportingEnabled" i18n-content="enableLogging">
322 </label>
323 <span class="controlled-setting-indicator"
324 pref="cros.metrics.reportingEnabled">
325 </span>
326 </span>
320 </if> 327 </if>
321 <if expr="not pp_ifdef('chromeos')"> 328 <if expr="not pp_ifdef('chromeos')">
322 <input id="metricsReportingEnabled" 329 <input id="metricsReportingEnabled"
323 pref="user_experience_metrics.reporting_enabled" type="checkbox"> 330 pref="user_experience_metrics.reporting_enabled" type="checkbox">
324 </if>
325 <span> 331 <span>
326 <label for="metricsReportingEnabled" i18n-content="enableLogging"> 332 <label for="metricsReportingEnabled" i18n-content="enableLogging">
327 </label> 333 </label>
328 <span class="controlled-setting-indicator" 334 <span class="controlled-setting-indicator"
329 pref="user_experience_metrics.reporting_enabled"> 335 pref="user_experience_metrics.reporting_enabled">
330 </span> 336 </span>
331 </span> 337 </span>
338 </if>
332 </span> 339 </span>
333 </div> 340 </div>
334 </if> <!-- pp_ifdef('_google_chrome') --> 341 </if> <!-- pp_ifdef('_google_chrome') -->
335 <div class="checkbox"> 342 <div class="checkbox">
336 <label> 343 <label>
337 <input id="do-not-track-enabled" pref="enable_do_not_track" 344 <input id="do-not-track-enabled" pref="enable_do_not_track"
338 metric="Options_DoNotTrackCheckbox" type="checkbox" dialog-pref> 345 metric="Options_DoNotTrackCheckbox" type="checkbox" dialog-pref>
339 <span i18n-content="doNotTrack"></span> 346 <span i18n-content="doNotTrack"></span>
340 </label> 347 </label>
341 </div> 348 </div>
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 </section> 663 </section>
657 </if> 664 </if>
658 </div> <!-- advanced-settings-container --> 665 </div> <!-- advanced-settings-container -->
659 </div> <!-- advanced-settings --> 666 </div> <!-- advanced-settings -->
660 <footer> 667 <footer>
661 <button id="advanced-settings-expander" class="link-button" 668 <button id="advanced-settings-expander" class="link-button"
662 i18n-content="showAdvancedSettings"> 669 i18n-content="showAdvancedSettings">
663 </button> 670 </button>
664 </footer> 671 </footer>
665 </div> 672 </div>
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_prefs_browsertest.cc ('k') | chrome/browser/resources/options/chromeos/accounts_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698