chrome/browser/prefs/browser_prefs.cc - Issue 1459793002: Android: Allow compiling browser without Java UI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 90a759972c8f29d74734e13a65b7c2cf1cef8333..2a336885310355cb74d5cfd51cc725f0cfef9d7b 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -137,7 +137,7 @@

#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"

#endif

-#if defined(OS_ANDROID)

+#if defined(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"

@@ -452,7 +452,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

SupervisedUserWhitelistService::RegisterProfilePrefs(registry);

#endif

-#if defined(OS_ANDROID)

+#if defined(ANDROID_JAVA_UI)

variations::VariationsService::RegisterProfilePrefs(registry);

MostVisitedSites::RegisterProfilePrefs(registry);

NewTabPagePrefs::RegisterProfilePrefs(registry);