summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e574ef8a..764e733 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -468,8 +468,12 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command,
}
metrics = browser_process->metrics_service();
DCHECK(metrics);
- // Start user experience metrics recording, if enabled.
- metrics->SetRecording(local_state->GetBoolean(prefs::kMetricsIsRecording));
+ // If the user permits metrics reporting with the checkbox in the
+ // prefs, we turn on recording.
+ bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
+ metrics->SetUserPermitsUpload(enabled);
+ if (enabled)
+ metrics->Start();
}
InstallJankometer(parsed_command_line);
@@ -490,7 +494,7 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command,
}
if (metrics)
- metrics->SetRecording(false); // Force persistent save.
+ metrics->Stop();
// browser_shutdown takes care of deleting browser_process, so we need to
// release it.