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

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 10387155: Web Intents: Remove the flag and compile-time define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/intents/web_intents_util.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 1a28215210c04870f35f78b74ee4557c0da4b87b..eb9017be144161689b9f6a4b5500374ab9874cb4 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -324,12 +324,8 @@ 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) {
-#if defined(ENABLE_WEB_INTENTS)
if (!web_intents::IsWebIntentsEnabledInActiveBrowser())
return false;
-#else
- return false;
-#endif
}
// BLOCK semantics are not implemented for fullscreen.
« no previous file with comments | « no previous file | chrome/browser/intents/web_intents_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698