Remove web intents from Chrome on Android build

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 305 matching lines @@
 bool HostContentSettingsMap::IsValueAllowedForType(
     const base::Value* value, ContentSettingsType type) {
   return IsSettingAllowedForType(
       content_settings::ValueToContentSetting(value), type);
 }
 
 // static
 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 &&
       setting == CONTENT_SETTING_BLOCK) {
     return false;
   }
 
   // DEFAULT, ALLOW and BLOCK are always allowed.
   if (setting == CONTENT_SETTING_DEFAULT ||
       setting == CONTENT_SETTING_ALLOW ||
@@ skipping 127 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return NULL;
 }