Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 5 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 #include "chrome/browser/google/google_brand.h" | 25 #include "chrome/browser/google/google_brand.h" |
| 26 #include "chrome/browser/metrics/chrome_stability_metrics_provider.h" | 26 #include "chrome/browser/metrics/chrome_stability_metrics_provider.h" |
| 27 #include "chrome/browser/metrics/time_ticks_experiment_win.h" | 27 #include "chrome/browser/metrics/time_ticks_experiment_win.h" |
| 28 #include "chrome/browser/ui/browser_otr_state.h" | 28 #include "chrome/browser/ui/browser_otr_state.h" |
| 29 #include "chrome/common/channel_info.h" | 29 #include "chrome/common/channel_info.h" |
| 30 #include "chrome/common/chrome_constants.h" | 30 #include "chrome/common/chrome_constants.h" |
| 31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
| 32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
| 33 #include "chrome/common/crash_keys.h" | 33 #include "chrome/common/crash_keys.h" |
| 34 #include "chrome/common/features.h" | 34 #include "chrome/common/features.h" |
| 35 #include "chrome/installer/util/util_constants.h" | |
| 35 #include "components/metrics/call_stack_profile_metrics_provider.h" | 36 #include "components/metrics/call_stack_profile_metrics_provider.h" |
| 36 #include "components/metrics/drive_metrics_provider.h" | 37 #include "components/metrics/drive_metrics_provider.h" |
| 38 #include "components/metrics/file_metrics_provider.h" | |
| 37 #include "components/metrics/gpu/gpu_metrics_provider.h" | 39 #include "components/metrics/gpu/gpu_metrics_provider.h" |
| 38 #include "components/metrics/metrics_pref_names.h" | 40 #include "components/metrics/metrics_pref_names.h" |
| 39 #include "components/metrics/metrics_service.h" | 41 #include "components/metrics/metrics_service.h" |
| 40 #include "components/metrics/net/net_metrics_log_uploader.h" | 42 #include "components/metrics/net/net_metrics_log_uploader.h" |
| 41 #include "components/metrics/net/network_metrics_provider.h" | 43 #include "components/metrics/net/network_metrics_provider.h" |
| 42 #include "components/metrics/net/version_utils.h" | 44 #include "components/metrics/net/version_utils.h" |
| 43 #include "components/metrics/profiler/profiler_metrics_provider.h" | 45 #include "components/metrics/profiler/profiler_metrics_provider.h" |
| 44 #include "components/metrics/profiler/tracking_synchronizer.h" | 46 #include "components/metrics/profiler/tracking_synchronizer.h" |
| 45 #include "components/metrics/stability_metrics_helper.h" | 47 #include "components/metrics/stability_metrics_helper.h" |
| 46 #include "components/metrics/ui/screen_info_metrics_provider.h" | 48 #include "components/metrics/ui/screen_info_metrics_provider.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 170 client->Initialize(); | 172 client->Initialize(); |
| 171 | 173 |
| 172 return client; | 174 return client; |
| 173 } | 175 } |
| 174 | 176 |
| 175 // static | 177 // static |
| 176 void ChromeMetricsServiceClient::RegisterPrefs(PrefRegistrySimple* registry) { | 178 void ChromeMetricsServiceClient::RegisterPrefs(PrefRegistrySimple* registry) { |
| 177 metrics::MetricsService::RegisterPrefs(registry); | 179 metrics::MetricsService::RegisterPrefs(registry); |
| 178 metrics::StabilityMetricsHelper::RegisterPrefs(registry); | 180 metrics::StabilityMetricsHelper::RegisterPrefs(registry); |
| 179 | 181 |
| 182 metrics::FileMetricsProvider::RegisterPrefs( | |
| 183 registry, installer::kSetupHistogramAllocatorName); | |
| 184 | |
| 180 #if BUILDFLAG(ANDROID_JAVA_UI) | 185 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 181 AndroidMetricsProvider::RegisterPrefs(registry); | 186 AndroidMetricsProvider::RegisterPrefs(registry); |
| 182 #endif // BUILDFLAG(ANDROID_JAVA_UI) | 187 #endif // BUILDFLAG(ANDROID_JAVA_UI) |
| 183 | 188 |
| 184 #if defined(ENABLE_PLUGINS) | 189 #if defined(ENABLE_PLUGINS) |
| 185 PluginMetricsProvider::RegisterPrefs(registry); | 190 PluginMetricsProvider::RegisterPrefs(registry); |
| 186 #endif // defined(ENABLE_PLUGINS) | 191 #endif // defined(ENABLE_PLUGINS) |
| 187 } | 192 } |
| 188 | 193 |
| 189 metrics::MetricsService* ChromeMetricsServiceClient::GetMetricsService() { | 194 metrics::MetricsService* ChromeMetricsServiceClient::GetMetricsService() { |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 328 base::Bind(&chrome::IsOffTheRecordSessionActive)))); | 333 base::Bind(&chrome::IsOffTheRecordSessionActive)))); |
| 329 metrics_service_->RegisterMetricsProvider( | 334 metrics_service_->RegisterMetricsProvider( |
| 330 scoped_ptr<metrics::MetricsProvider>(new ChromeStabilityMetricsProvider( | 335 scoped_ptr<metrics::MetricsProvider>(new ChromeStabilityMetricsProvider( |
| 331 g_browser_process->local_state()))); | 336 g_browser_process->local_state()))); |
| 332 metrics_service_->RegisterMetricsProvider( | 337 metrics_service_->RegisterMetricsProvider( |
| 333 scoped_ptr<metrics::MetricsProvider>(new metrics::GPUMetricsProvider)); | 338 scoped_ptr<metrics::MetricsProvider>(new metrics::GPUMetricsProvider)); |
| 334 metrics_service_->RegisterMetricsProvider( | 339 metrics_service_->RegisterMetricsProvider( |
| 335 scoped_ptr<metrics::MetricsProvider>( | 340 scoped_ptr<metrics::MetricsProvider>( |
| 336 new metrics::ScreenInfoMetricsProvider)); | 341 new metrics::ScreenInfoMetricsProvider)); |
| 337 | 342 |
| 343 #if defined(OS_WIN) | |
| 344 scoped_ptr<metrics::FileMetricsProvider> file_metrics( | |
| 345 new metrics::FileMetricsProvider(metrics_service_.get(), | |
| 346 g_browser_process->local_state())); | |
| 347 file_metrics->RegisterFile( | |
| 348 base::CommandLine::ForCurrentProcess()->GetProgram().DirName() | |
|
grt (UTC plus 2)
2016/02/08 18:09:18
use base::PathService::Get(base::DIR_EXE, &dir) in
bcwhite
2016/02/09 21:08:45
Done.
| |
| 349 .AppendASCII(installer::kSetupHistogramAllocatorName) | |
| 350 .AddExtension(L".pma"), | |
|
Alexei Svitkine (slow)
2016/02/09 19:48:15
Can this logic be somewhere outside this file? See
grt (UTC plus 2)
2016/02/15 15:42:39
ping
bcwhite
2016/02/15 19:22:10
How about just a constant that has both the file n
Alexei Svitkine (slow)
2016/02/17 21:55:35
Sorry, in this comment I meant all the stuff to in
bcwhite
2016/02/18 01:46:56
As in
class FileMetricsProvider {
...
static sco
Alexei Svitkine (slow)
2016/02/18 15:50:32
Sorry, not exactly what I meant. I mean not having
bcwhite
2016/02/18 19:35:01
Done.
| |
| 351 metrics::FileMetricsProvider::FILE_HISTOGRAMS_ATOMIC, | |
| 352 installer::kSetupHistogramAllocatorName); | |
| 353 metrics_service_->RegisterMetricsProvider(std::move(file_metrics)); | |
| 354 #endif | |
| 355 | |
| 338 drive_metrics_provider_ = new metrics::DriveMetricsProvider( | 356 drive_metrics_provider_ = new metrics::DriveMetricsProvider( |
| 339 content::BrowserThread::GetMessageLoopProxyForThread( | 357 content::BrowserThread::GetMessageLoopProxyForThread( |
| 340 content::BrowserThread::FILE), | 358 content::BrowserThread::FILE), |
| 341 chrome::FILE_LOCAL_STATE); | 359 chrome::FILE_LOCAL_STATE); |
| 342 metrics_service_->RegisterMetricsProvider( | 360 metrics_service_->RegisterMetricsProvider( |
| 343 scoped_ptr<metrics::MetricsProvider>(drive_metrics_provider_)); | 361 scoped_ptr<metrics::MetricsProvider>(drive_metrics_provider_)); |
| 344 | 362 |
| 345 profiler_metrics_provider_ = | 363 profiler_metrics_provider_ = |
| 346 new metrics::ProfilerMetricsProvider(base::Bind(&IsCellularLogicEnabled)); | 364 new metrics::ProfilerMetricsProvider(base::Bind(&IsCellularLogicEnabled)); |
| 347 metrics_service_->RegisterMetricsProvider( | 365 metrics_service_->RegisterMetricsProvider( |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 516 if (!ServiceProcessControl::GetInstance()->GetHistograms(callback, timeout)) { | 534 if (!ServiceProcessControl::GetInstance()->GetHistograms(callback, timeout)) { |
| 517 // Assume |num_async_histogram_fetches_in_progress_| is not changed by | 535 // Assume |num_async_histogram_fetches_in_progress_| is not changed by |
| 518 // |GetHistograms()|. | 536 // |GetHistograms()|. |
| 519 DCHECK_EQ(num_async_histogram_fetches_in_progress_, 2); | 537 DCHECK_EQ(num_async_histogram_fetches_in_progress_, 2); |
| 520 // Assign |num_async_histogram_fetches_in_progress_| above and decrement it | 538 // Assign |num_async_histogram_fetches_in_progress_| above and decrement it |
| 521 // here to make code work even if |GetHistograms()| fired |callback|. | 539 // here to make code work even if |GetHistograms()| fired |callback|. |
| 522 --num_async_histogram_fetches_in_progress_; | 540 --num_async_histogram_fetches_in_progress_; |
| 523 } | 541 } |
| 524 #endif // !ENABLE_PRINT_PREVIEW | 542 #endif // !ENABLE_PRINT_PREVIEW |
| 525 | 543 |
| 526 // Set up the callback to task to call after we receive histograms from all | 544 // Set up the callback task to call after we receive histograms from all |
| 527 // child processes. |timeout| specifies how long to wait before absolutely | 545 // child processes. |timeout| specifies how long to wait before absolutely |
| 528 // calling us back on the task. | 546 // calling us back on the task. |
| 529 content::FetchHistogramsAsynchronously(base::MessageLoop::current(), callback, | 547 content::FetchHistogramsAsynchronously(base::MessageLoop::current(), callback, |
| 530 timeout); | 548 timeout); |
| 531 } | 549 } |
| 532 | 550 |
| 533 void ChromeMetricsServiceClient::OnHistogramSynchronizationDone() { | 551 void ChromeMetricsServiceClient::OnHistogramSynchronizationDone() { |
| 534 DCHECK(thread_checker_.CalledOnValidThread()); | 552 DCHECK(thread_checker_.CalledOnValidThread()); |
| 535 | 553 |
| 536 // This function should only be called as the callback from an ansynchronous | 554 // This function should only be called as the callback from an ansynchronous |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 611 break; | 629 break; |
| 612 | 630 |
| 613 default: | 631 default: |
| 614 NOTREACHED(); | 632 NOTREACHED(); |
| 615 } | 633 } |
| 616 } | 634 } |
| 617 | 635 |
| 618 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) { | 636 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) { |
| 619 metrics_service_->OnApplicationNotIdle(); | 637 metrics_service_->OnApplicationNotIdle(); |
| 620 } | 638 } |
| OLD | NEW |