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

Unified Diff: chrome/browser/resources/options/browser_options.js

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: Return updated state instead of success identifier + minor changes 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/metrics/metrics_reporting_state.cc ('K') | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/ui/views/session_crashed_bubble_view.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/browser_options.js

diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js

index aea83e6ea6f85d6c80d20e75eed3bac97f7a7da1..18310ac52c2f31f5273ef2f9cba9f02a7c2e0579 100644

--- a/chrome/browser/resources/options/browser_options.js

+++ b/chrome/browser/resources/options/browser_options.js

@@ -388,14 +388,19 @@ cr.define('options', function() {

restartElements[1].onclick = function(event) {

chrome.send('restartBrowser');

};

+ // Attach the listener for updating the checkbox and restart button.

var updateMetricsRestartButton = function() {

$('metrics-reporting-reset-restart').hidden =

loadTimeData.getBoolean('metricsReportingEnabledAtStart') ==

$('metricsReportingEnabled').checked;

};

- Preferences.getInstance().addEventListener(

- $('metricsReportingEnabled').getAttribute('pref'),

- updateMetricsRestartButton);

+ $('metricsReportingEnabled').onclick = function(event) {

+ chrome.send('metricsReportingCheckboxChanged',

+ [Boolean(event.currentTarget.checked)]);

+ updateMetricsRestartButton();

+ };

+ $('metricsReportingEnabled').checked =

+ loadTimeData.getBoolean('metricsReportingEnabledAtStart');

updateMetricsRestartButton();

}

$('networkPredictionOptions').onchange = function(event) {

@@ -1518,7 +1523,13 @@ cr.define('options', function() {

setMetricsReportingCheckboxState_: function(checked, disabled) {

$('metricsReportingEnabled').checked = checked;

- $('metricsReportingEnabled').disabled = disabled;

+ if (typeof disabled !== 'undefined') {

Alexei Svitkine (slow) 2014/09/09 15:27:15 I would just require the callers to always pass th

gayane -on leave until 09-2017 2014/09/09 19:40:51 Done.

+ $('metricsReportingEnabled').disabled = disabled;

+ if (disabled) {

Alexei Svitkine (slow) 2014/09/09 15:27:15 Add a comment why it's OK to not handle the else o

gayane -on leave until 09-2017 2014/09/09 19:40:51 Done.

+ $('metrics-reporting-disabled-icon').setAttribute('controlled-by',

+ 'policy');

+ }

/**