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

Side by Side 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: Always pass all params to setMetricsReportingCheckboxState, 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('options', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 var Page = cr.ui.pageManager.Page; 7 var Page = cr.ui.pageManager.Page;
8 var PageManager = cr.ui.pageManager.PageManager; 8 var PageManager = cr.ui.pageManager.PageManager;
9 var ArrayDataModel = cr.ui.ArrayDataModel; 9 var ArrayDataModel = cr.ui.ArrayDataModel;
10 var RepeatingButton = cr.ui.RepeatingButton; 10 var RepeatingButton = cr.ui.RepeatingButton;
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 // text" where both starting text and ending text may or may not be 381 // text" where both starting text and ending text may or may not be
382 // present, but the split should always be in three pieces. 382 // present, but the split should always be in three pieces.
383 var restartElements = 383 var restartElements =
384 $('metrics-reporting-reset-restart').querySelectorAll('*'); 384 $('metrics-reporting-reset-restart').querySelectorAll('*');
385 for (var i = 0; i < restartTextFragments.length; i++) { 385 for (var i = 0; i < restartTextFragments.length; i++) {
386 restartElements[i].textContent = restartTextFragments[i]; 386 restartElements[i].textContent = restartTextFragments[i];
387 } 387 }
388 restartElements[1].onclick = function(event) { 388 restartElements[1].onclick = function(event) {
389 chrome.send('restartBrowser'); 389 chrome.send('restartBrowser');
390 }; 390 };
391 // Attach the listener for updating the checkbox and restart button.
391 var updateMetricsRestartButton = function() { 392 var updateMetricsRestartButton = function() {
392 $('metrics-reporting-reset-restart').hidden = 393 $('metrics-reporting-reset-restart').hidden =
393 loadTimeData.getBoolean('metricsReportingEnabledAtStart') == 394 loadTimeData.getBoolean('metricsReportingEnabledAtStart') ==
394 $('metricsReportingEnabled').checked; 395 $('metricsReportingEnabled').checked;
395 }; 396 };
396 Preferences.getInstance().addEventListener( 397 $('metricsReportingEnabled').onclick = function(event) {
397 $('metricsReportingEnabled').getAttribute('pref'), 398 chrome.send('metricsReportingCheckboxChanged',
398 updateMetricsRestartButton); 399 [Boolean(event.currentTarget.checked)]);
400 updateMetricsRestartButton();
401 };
402 $('metricsReportingEnabled').checked =
403 loadTimeData.getBoolean('metricsReportingEnabledAtStart');
399 updateMetricsRestartButton(); 404 updateMetricsRestartButton();
400 } 405 }
401 $('networkPredictionOptions').onchange = function(event) { 406 $('networkPredictionOptions').onchange = function(event) {
402 var value = (event.target.checked ? 407 var value = (event.target.checked ?
403 NetworkPredictionOptions.WIFI_ONLY : 408 NetworkPredictionOptions.WIFI_ONLY :
404 NetworkPredictionOptions.NEVER); 409 NetworkPredictionOptions.NEVER);
405 var metric = event.target.metric; 410 var metric = event.target.metric;
406 Preferences.setIntegerPref( 411 Preferences.setIntegerPref(
407 'net.network_prediction_options', 412 'net.network_prediction_options',
408 value, 413 value,
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 $('factory-reset-section').hidden = false; 1517 $('factory-reset-section').hidden = false;
1513 }, 1518 },
1514 1519
1515 /** 1520 /**
1516 * Set the checked state of the metrics reporting checkbox. 1521 * Set the checked state of the metrics reporting checkbox.
1517 * @private 1522 * @private
1518 */ 1523 */
1519 setMetricsReportingCheckboxState_: function(checked, disabled) { 1524 setMetricsReportingCheckboxState_: function(checked, disabled) {
1520 $('metricsReportingEnabled').checked = checked; 1525 $('metricsReportingEnabled').checked = checked;
1521 $('metricsReportingEnabled').disabled = disabled; 1526 $('metricsReportingEnabled').disabled = disabled;
1527
1528 // if checkbox gets disabled then add a attribute for displaying the
Alexei Svitkine (slow) 2014/09/09 20:30:05 Nit: Capitalize; also, "a attribute" -> "an attrib
gayane -on leave until 09-2017 2014/09/10 16:58:27 Done.
1529 // special icon. The opposite shouldn't be possible to do.
1530 if (disabled) {
1531 $('metrics-reporting-disabled-icon').setAttribute('controlled-by',
1532 'policy');
1533 }
1522 }, 1534 },
1523 1535
1524 /** 1536 /**
1525 * @private 1537 * @private
1526 */ 1538 */
1527 setMetricsReportingSettingVisibility_: function(visible) { 1539 setMetricsReportingSettingVisibility_: function(visible) {
1528 if (visible) 1540 if (visible)
1529 $('metricsReportingSetting').style.display = 'block'; 1541 $('metricsReportingSetting').style.display = 'block';
1530 else 1542 else
1531 $('metricsReportingSetting').style.display = 'none'; 1543 $('metricsReportingSetting').style.display = 'none';
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 BrowserOptions.getLoggedInUsername = function() { 1990 BrowserOptions.getLoggedInUsername = function() {
1979 return BrowserOptions.getInstance().username_; 1991 return BrowserOptions.getInstance().username_;
1980 }; 1992 };
1981 } 1993 }
1982 1994
1983 // Export 1995 // Export
1984 return { 1996 return {
1985 BrowserOptions: BrowserOptions 1997 BrowserOptions: BrowserOptions
1986 }; 1998 };
1987 }); 1999 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698