diff options
| author | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 20:04:56 +0000 |
|---|---|---|
| committer | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 20:04:56 +0000 |
| commit | 7e199326c908b98362c4eaa94429f7875703675d (patch) | |
| tree | b307ad8f94bc3c73a04eb2c6ff336837bd2213a4 /chrome/browser/prefs | |
| parent | 8252a40a112626393c77e34a43ba755f38476ca6 (diff) | |
| download | chromium_src-7e199326c908b98362c4eaa94429f7875703675d.zip chromium_src-7e199326c908b98362c4eaa94429f7875703675d.tar.gz chromium_src-7e199326c908b98362c4eaa94429f7875703675d.tar.bz2 | |
Remove web intents from Chrome on Android build
Chrome on Android doesn't currently support web intents. This change fixes linker errors that occuring when trying to build sync_unit_tests.
BUG=113487
TEST=
Review URL: http://codereview.chromium.org/9521013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index d81d0a1..521474f 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) |