Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1515)

Unified Diff: chrome/browser/content_settings/host_content_settings_map.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/intents/register_intent_handler_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fe42c5966679ae099528c8ab3519a83f0e17a1d9 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -323,9 +323,14 @@ 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(ENABLE_WEB_INTENTS)
+ if (!web_intents::IsWebIntentsEnabled())
+ return false;
+#else
return false;
+#endif
+ }
// BLOCK semantics are not implemented for fullscreen.
if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN &&
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/intents/register_intent_handler_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698