chrome/browser/prefs/browser_prefs.cc - Issue 9521013: Remove web intents from Chrome on Android build

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 9521013: Remove web intents from Chrome on Android build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix buildbot compile errors Created 8 years, 9 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index d81d0a18921423286b54b2cd705cccd630a8e1da..521474f88a1907ead06091947db19ce652a06d7d 100644

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

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

@@ -199,12 +199,15 @@ void RegisterUserPrefs(PrefService* user_prefs) {

SessionStartupPref::RegisterUserPrefs(user_prefs);

TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);

TranslatePrefs::RegisterUserPrefs(user_prefs);

- web_intents::RegisterUserPrefs(user_prefs);

#if defined(ENABLE_CONFIGURATION_POLICY)

policy::URLBlacklistManager::RegisterPrefs(user_prefs);

#endif

+#if defined(ENABLE_WEB_INTENTS)

+ web_intents::RegisterUserPrefs(user_prefs);

+#endif

#if defined(TOOLKIT_VIEWS)

BrowserActionsContainer::RegisterUserPrefs(user_prefs);

#elif defined(TOOLKIT_GTK)