OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/content_settings/host_content_settings_map.h" | 5 #include "chrome/browser/content_settings/host_content_settings_map.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 const base::Value* value, ContentSettingsType type) { | 304 const base::Value* value, ContentSettingsType type) { |
305 return IsSettingAllowedForType( | 305 return IsSettingAllowedForType( |
306 content_settings::ValueToContentSetting(value), type); | 306 content_settings::ValueToContentSetting(value), type); |
307 } | 307 } |
308 | 308 |
309 // static | 309 // static |
310 bool HostContentSettingsMap::IsSettingAllowedForType( | 310 bool HostContentSettingsMap::IsSettingAllowedForType( |
311 ContentSetting setting, ContentSettingsType content_type) { | 311 ContentSetting setting, ContentSettingsType content_type) { |
312 // Intents content settings are hidden behind a switch for now. | 312 // Intents content settings are hidden behind a switch for now. |
313 if (content_type == CONTENT_SETTINGS_TYPE_INTENTS && | 313 if (content_type == CONTENT_SETTINGS_TYPE_INTENTS && |
314 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) | 314 !CommandLine::ForCurrentProcess()->HasSwitch( |
| 315 switches::kEnableWebIntents)) |
315 return false; | 316 return false; |
316 | 317 |
317 // BLOCK semantics are not implemented for fullscreen. | 318 // BLOCK semantics are not implemented for fullscreen. |
318 if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN && | 319 if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN && |
319 setting == CONTENT_SETTING_BLOCK) { | 320 setting == CONTENT_SETTING_BLOCK) { |
320 return false; | 321 return false; |
321 } | 322 } |
322 | 323 |
323 // DEFAULT, ALLOW and BLOCK are always allowed. | 324 // DEFAULT, ALLOW and BLOCK are always allowed. |
324 if (setting == CONTENT_SETTING_DEFAULT || | 325 if (setting == CONTENT_SETTING_DEFAULT || |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 } | 453 } |
453 } | 454 } |
454 | 455 |
455 if (info) { | 456 if (info) { |
456 info->source = content_settings::SETTING_SOURCE_NONE; | 457 info->source = content_settings::SETTING_SOURCE_NONE; |
457 info->primary_pattern = ContentSettingsPattern(); | 458 info->primary_pattern = ContentSettingsPattern(); |
458 info->secondary_pattern = ContentSettingsPattern(); | 459 info->secondary_pattern = ContentSettingsPattern(); |
459 } | 460 } |
460 return NULL; | 461 return NULL; |
461 } | 462 } |
OLD | NEW |