| 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 4503e06a31562857f5b7f0382fc1e5e321a44f26..48740bc7cec9ee1ac3fa9c4710b63040c5e11e7b 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -22,7 +22,6 @@
|
| #include "chrome/browser/content_settings/content_settings_rule.h"
|
| #include "chrome/browser/content_settings/content_settings_utils.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/intents/web_intents_util.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -332,12 +331,6 @@ bool HostContentSettingsMap::IsSettingAllowedForType(
|
| PrefService* prefs,
|
| ContentSetting setting,
|
| ContentSettingsType content_type) {
|
| - // Intents content settings are hidden behind a switch for now.
|
| - if (content_type == CONTENT_SETTINGS_TYPE_INTENTS) {
|
| - if (!web_intents::IsWebIntentsEnabled(prefs))
|
| - return false;
|
| - }
|
| -
|
| // We don't yet support stored content settings for mixed scripting.
|
| if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT)
|
| return false;
|
| @@ -366,7 +359,6 @@ bool HostContentSettingsMap::IsSettingAllowedForType(
|
| case CONTENT_SETTINGS_TYPE_PLUGINS:
|
| case CONTENT_SETTINGS_TYPE_GEOLOCATION:
|
| case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
|
| - case CONTENT_SETTINGS_TYPE_INTENTS:
|
| case CONTENT_SETTINGS_TYPE_MOUSELOCK:
|
| case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
|
| case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
|
|
|