Chromium Code Reviews| 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 b0baa0425bf6024d7d1ca7959f192a8d9a8dfac3..8eca086e0635579124c312d7e47e712fd6896eeb 100644 |
| --- a/chrome/browser/content_settings/host_content_settings_map.cc |
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc |
| @@ -310,6 +310,12 @@ bool HostContentSettingsMap::IsSettingAllowedForType( |
| switches::kEnableWebIntents)) |
| return false; |
| + // 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 || |
| @@ -326,7 +332,9 @@ bool HostContentSettingsMap::IsSettingAllowedForType( |
| case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
| case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| case CONTENT_SETTINGS_TYPE_INTENTS: |
| - return (setting == CONTENT_SETTING_ASK); |
| + return setting == CONTENT_SETTING_ASK; |
| + case CONTENT_SETTINGS_TYPE_FULLSCREEN: |
|
Evan Stade
2011/11/17 23:07:37
why is this separate from the above cases?
koz (OOO until 15th September)
2011/11/17 23:37:53
Done.
|
| + return setting == CONTENT_SETTING_ASK; |
| default: |
| return false; |
| } |