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..d263718122a3f94f2187ee482e7ba11ebf22707f 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 || |
@@ -318,15 +324,16 @@ bool HostContentSettingsMap::IsSettingAllowedForType( |
} |
switch (content_type) { |
case CONTENT_SETTINGS_TYPE_COOKIES: |
- return (setting == CONTENT_SETTING_SESSION_ONLY); |
+ return setting == CONTENT_SETTING_SESSION_ONLY; |
case CONTENT_SETTINGS_TYPE_PLUGINS: |
- return (setting == CONTENT_SETTING_ASK && |
- CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableClickToPlay)); |
+ return setting == CONTENT_SETTING_ASK && |
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableClickToPlay); |
case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
case CONTENT_SETTINGS_TYPE_INTENTS: |
- return (setting == CONTENT_SETTING_ASK); |
+ case CONTENT_SETTINGS_TYPE_FULLSCREEN: |
+ return setting == CONTENT_SETTING_ASK; |
jochen (gone - plz use gerrit)
2011/11/18 00:00:53
hum, didn't you say you've removed ask?
koz (OOO until 15th September)
2011/11/18 00:07:59
Ah, only from the UI. Done.
|
default: |
return false; |
} |