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

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

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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
Index: chrome/browser/metrics/chrome_metrics_service_accessor.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor.cc b/chrome/browser/metrics/chrome_metrics_service_accessor.cc
index e4416f7c60ca18af458044141dab9fac5cc3cd20..0fe57ab5de566114388fe96b2a27803213f579af 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor.cc
@@ -6,6 +6,7 @@
#include "base/prefs/pref_service.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/common/features.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_thread.h"
@@ -29,7 +30,7 @@ bool ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled() {
return false;
}
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
return IsMetricsReportingEnabled(g_browser_process->local_state());
#else
// Android currently obtain the value for whether the user has
@@ -42,7 +43,7 @@ bool ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled() {
pref_value = g_browser_process->local_state()->GetBoolean(
prefs::kCrashReportingEnabled);
return IsMetricsReportingEnabledWithPrefValue(pref_value);
-#endif // !defined(OS_ANDROID)
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
}
// static
« no previous file with comments | « chrome/browser/media/router/media_router_dialog_controller.cc ('k') | chrome/browser/metrics/chrome_metrics_service_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698