Remove web intents from Chrome on Android build

chrome/browser/content_settings/host_content_settings_map.cc

Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 008821826cc7129a32dffd384612ffc4703a3796..0d75579a79ae2a1c7edf2093c02f50d77a1f67bf 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -323,9 +323,15 @@ bool HostContentSettingsMap::IsValueAllowedForType(
 bool HostContentSettingsMap::IsSettingAllowedForType(
     ContentSetting setting, ContentSettingsType content_type) {
   // Intents content settings are hidden behind a switch for now.
-  if (content_type == CONTENT_SETTINGS_TYPE_INTENTS &&
-      !web_intents::IsWebIntentsEnabled())
+  if (content_type == CONTENT_SETTINGS_TYPE_INTENTS) {
+#if !defined(OS_ANDROID)
+    if (!web_intents::IsWebIntentsEnabled()) {

[James Hawkins, 2012/03/08 05:21:22]

nit: No braces here.

[Jesse Greenwald, 2012/03/08 18:35:28]

Done.

+      return false;
+    }
+#else
     return false;
+#endif
+  }
 
   // BLOCK semantics are not implemented for fullscreen.
   if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN &&