Chromium Code Reviews| Index: chrome/browser/metrics/chrome_metrics_service_client.cc |
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc |
| index 173f6224d91f9673da513d0451e02f0b6a74d5a7..7a01f2697875f449aaf5574402cb8cb1afb52978 100644 |
| --- a/chrome/browser/metrics/chrome_metrics_service_client.cc |
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc |
| @@ -43,7 +43,9 @@ |
| #if defined(OS_ANDROID) |
| #include "chrome/browser/metrics/android_metrics_provider.h" |
| -#else |
| +#endif |
| + |
| +#if defined(ENABLE_FULL_PRINTING) |
| #include "chrome/browser/service_process/service_process_control.h" |
| #endif |
| @@ -394,10 +396,10 @@ void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() { |
| DCHECK_EQ(num_async_histogram_fetches_in_progress_, 0); |
| -#if defined(OS_ANDROID) |
| +#if !defined(ENABLE_FULL_PRINTING) |
| // Android has no service process. |
|
Lei Zhang
2014/09/08 18:50:35
remove android comment
Vitaly Buka (NO REVIEWS)
2014/09/08 21:21:45
Done.
|
| num_async_histogram_fetches_in_progress_ = 1; |
| -#else // OS_ANDROID |
| +#else // !ENABLE_FULL_PRINTING |
| num_async_histogram_fetches_in_progress_ = 2; |
| // Run requests to service and content in parallel. |
| if (!ServiceProcessControl::GetInstance()->GetHistograms(callback, timeout)) { |
| @@ -408,7 +410,7 @@ void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() { |
| // here to make code work even if |GetHistograms()| fired |callback|. |
| --num_async_histogram_fetches_in_progress_; |
| } |
| -#endif // OS_ANDROID |
| +#endif // !ENABLE_FULL_PRINTING |
| // Set up the callback to task to call after we receive histograms from all |
| // child processes. |timeout| specifies how long to wait before absolutely |