| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index d3b772e0fcfeaee3a936c0ea55239921568252af..72a447fe1cc167b0bf95d04021ce90df57901cfb 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -30,6 +30,8 @@
|
| #include "chrome/browser/download/download_prefs.h"
|
| #include "chrome/browser/gpu/gpu_mode_manager.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| +#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
|
| +#include "chrome/browser/metrics/metrics_reporting_state.h"
|
| #include "chrome/browser/net/prediction_options.h"
|
| #include "chrome/browser/prefs/session_startup_pref.h"
|
| #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
|
| @@ -538,9 +540,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
|
|
|
| #if !defined(OS_CHROMEOS)
|
| - PrefService* pref_service = g_browser_process->local_state();
|
| - values->SetBoolean("metricsReportingEnabledAtStart", pref_service->GetBoolean(
|
| - prefs::kMetricsReportingEnabled));
|
| + values->SetBoolean("metricsReportingEnabledAtStart",
|
| + ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -875,7 +876,6 @@ void BrowserOptionsHandler::InitializeHandler() {
|
| prefs::kEasyUnlockPairing,
|
| base::Bind(&BrowserOptionsHandler::SetupEasyUnlock,
|
| base::Unretained(this)));
|
| -
|
| #if defined(OS_WIN)
|
| profile_pref_registrar_.Add(
|
| prefs::kURLsToRestoreOnStartup,
|
| @@ -929,6 +929,7 @@ void BrowserOptionsHandler::InitializePage() {
|
| SetupManagingSupervisedUsers();
|
| SetupEasyUnlock();
|
| SetupExtensionControlledIndicators();
|
| + SetupMetricsReportingCheckbox();
|
|
|
| #if defined(OS_CHROMEOS)
|
| SetupAccessibilityFeatures();
|
| @@ -1867,4 +1868,12 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
|
| #endif // defined(OS_WIN)
|
| }
|
|
|
| +void BrowserOptionsHandler::SetupMetricsReportingCheckbox() {
|
| + base::FundamentalValue checked(IsMetricsReportingEnabled());
|
| + base::FundamentalValue disabled(!IsMetricsReportingUserChangable());
|
| +
|
| + web_ui()->CallJavascriptFunction(
|
| + "BrowserOptions.setMetricsReportingCheckboxState", checked, disabled);
|
| +}
|
| +
|
| } // namespace options
|
|
|