chrome/browser/resources/options/browser_options.html - Issue 506663003: Consolidates accessing and setting the UMA pref to be within metrics code

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

Issue 506663003: Consolidates accessing and setting the UMA pref to be within metrics code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ChromeOS and Android support in IsMetricsReportingUserChangable Created 6 years, 3 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

« chrome/browser/metrics/metrics_reporting_state.cc ('K') | « chrome/browser/metrics/metrics_reporting_state.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <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 349 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
360 <label>	360 <label>

361 <input id="metricsReportingEnabled"	361 <input id="metricsReportingEnabled"

362 pref="cros.metrics.reportingEnabled" type="checkbox">	362 pref="cros.metrics.reportingEnabled" type="checkbox">

363 <span i18n-content="enableLogging"></span>	363 <span i18n-content="enableLogging"></span>

364 </label>	364 </label>

365 <span class="controlled-setting-indicator"	365 <span class="controlled-setting-indicator"

366 pref="cros.metrics.reportingEnabled"></span>	366 pref="cros.metrics.reportingEnabled"></span>

367 </if>	367 </if>

368 <if expr="not chromeos">	368 <if expr="not chromeos">

369 <label>	369 <label>

370 <input id="metricsReportingEnabled"	370 <input id="metricsReportingEnabled" type="checkbox">

371 pref="user_experience_metrics.reporting_enabled" type="checkbox">

372 <span i18n-content="enableLogging">	371 <span i18n-content="enableLogging">

373 </label>	372 </label>

374 <span class="controlled-setting-indicator"	373 <span id="metrics-reporting-disabled-icon"

375 pref="user_experience_metrics.reporting_enabled">	374 class="controlled-setting-indicator">

376 </span>	375 </span>

377 <span id="metrics-reporting-reset-restart">	376 <span id="metrics-reporting-reset-restart">

378 <!-- Text filled by JavaScript -->	377 <!-- Text filled by JavaScript -->

379 <span></span><button class=	378 <span></span><button class=

380 "link-button standalone-link-button"></button><span></span>	379 "link-button standalone-link-button"></button><span></span>

381 </span>	380 </span>

382 </if>	381 </if>

383 </div>	382 </div>

384 </if> <!-- _google_chrome -->	383 </if> <!-- _google_chrome -->

385 <div class="checkbox">	384 <div class="checkbox">

(...skipping 484 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
870 <button id="advanced-settings-expander" class="link-button"	869 <button id="advanced-settings-expander" class="link-button"

871 i18n-content="showAdvancedSettings">	870 i18n-content="showAdvancedSettings">

872 </button>	871 </button>

873 <if expr="chromeos">	872 <if expr="chromeos">

874 <button id="version-button" class="link-button" hidden	873 <button id="version-button" class="link-button" hidden

875 i18n-content="browserVersion">	874 i18n-content="browserVersion">

876 </button>	875 </button>

877 </if>	876 </if>

878 </footer>	877 </footer>

879 </div>	878 </div>

OLD	NEW