diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-13 01:49:57 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-13 01:49:57 +0000 |
| commit | 220043208469fbc19aaa4aed6ae7f75aabbf95b9 (patch) | |
| tree | b0f9223a211de11116c6354c4f770bab7fa4db25 /chrome/browser/browser_main.cc | |
| parent | 60bf8fa69c1fe068ff8db444e98fd110e6e4b4e3 (diff) | |
| download | chromium_src-220043208469fbc19aaa4aed6ae7f75aabbf95b9.zip chromium_src-220043208469fbc19aaa4aed6ae7f75aabbf95b9.tar.gz chromium_src-220043208469fbc19aaa4aed6ae7f75aabbf95b9.tar.bz2 | |
Back r2151 since it causes ui tests failures.
Review URL: http://codereview.chromium.org/3037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 764e733..e574ef8a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -468,12 +468,8 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, } metrics = browser_process->metrics_service(); DCHECK(metrics); - // 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(); + // Start user experience metrics recording, if enabled. + metrics->SetRecording(local_state->GetBoolean(prefs::kMetricsIsRecording)); } InstallJankometer(parsed_command_line); @@ -494,7 +490,7 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, } if (metrics) - metrics->Stop(); + metrics->SetRecording(false); // Force persistent save. // browser_shutdown takes care of deleting browser_process, so we need to // release it. |