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

Unified Diff: chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ee136d2b1e606bc518e261d6bf98394761d5b77d..8403f7072e2c160014e26e8b8a11335ecdbbabe1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -66,6 +66,7 @@
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/plugins_ui.h"
#include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
+#include "chrome/common/features.h"
#include "chrome/common/pref_names.h"
#include "components/autofill/core/browser/autofill_manager.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -138,7 +139,7 @@
#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
#endif
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
#include "chrome/browser/android/most_visited_sites.h"
#include "chrome/browser/android/new_tab_page_prefs.h"
@@ -462,7 +463,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
#endif
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
variations::VariationsService::RegisterProfilePrefs(registry);
MostVisitedSites::RegisterProfilePrefs(registry);
NewTabPagePrefs::RegisterProfilePrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698