Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Unified Diff: chrome/browser/metrics/chrome_metrics_service_client.cc

Issue 552703002: Fix compilation on Windows with enable_printing=2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mon Sep 8 17:26:04 PDT 2014 Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/local_discovery/privet_http_unittest.cc ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4db6bcc74eb2088f9ff1e126a34e1177b2381274 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,9 @@ void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() {
DCHECK_EQ(num_async_histogram_fetches_in_progress_, 0);
-#if defined(OS_ANDROID)
- // Android has no service process.
+#if !defined(ENABLE_FULL_PRINTING)
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 +409,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
« no previous file with comments | « chrome/browser/local_discovery/privet_http_unittest.cc ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698