Index: components/content_settings/core/browser/content_settings_registry.cc |
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc |
index 240243d1961e0ca1e04543ead37b120323dab534..b101a26448b2500ddfea1a4582b6a2b12dfdabd8 100644 |
--- a/components/content_settings/core/browser/content_settings_registry.cc |
+++ b/components/content_settings/core/browser/content_settings_registry.cc |
@@ -96,6 +96,7 @@ ContentSettingsRegistry::~ContentSettingsRegistry() {} |
const ContentSettingsInfo* ContentSettingsRegistry::Get( |
ContentSettingsType type) const { |
+ LOG(ERROR) << "--------lshang--------Get-----" << type; |
raymes
2016/06/16 03:23:50
nit: remove this
lshang
2016/06/20 01:34:22
Done.
|
const auto& it = content_settings_info_.find(type); |
if (it != content_settings_info_.end()) |
return it->second.get(); |
@@ -123,7 +124,7 @@ void ContentSettingsRegistry::Init() { |
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, |
CONTENT_SETTING_SESSION_ONLY), |
- WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::ALL_PLATFORMS, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -132,7 +133,7 @@ void ContentSettingsRegistry::Init() { |
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, |
kExtensionScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -141,7 +142,7 @@ void ContentSettingsRegistry::Init() { |
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, |
kExtensionScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP | |
WebsiteSettingsRegistry::PLATFORM_ANDROID, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -153,7 +154,7 @@ void ContentSettingsRegistry::Init() { |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, |
CONTENT_SETTING_ASK, |
CONTENT_SETTING_DETECT_IMPORTANT_CONTENT), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -162,7 +163,7 @@ void ContentSettingsRegistry::Init() { |
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, |
kExtensionScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
raymes
2016/06/16 03:23:50
Shouldn't these be TOP_LEVEL_ORIGIN_ONLY?
lshang
2016/06/20 01:34:22
Done.
|
WebsiteSettingsRegistry::ALL_PLATFORMS, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -202,7 +203,7 @@ void ContentSettingsRegistry::Init() { |
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, |
CONTENT_SETTING_ASK), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
raymes
2016/06/16 03:23:50
and this one?
lshang
2016/06/20 01:34:22
Done.
|
WebsiteSettingsRegistry::DESKTOP, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -241,7 +242,7 @@ void ContentSettingsRegistry::Init() { |
kExtensionScheme), |
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, |
CONTENT_SETTING_ASK), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP | |
WebsiteSettingsRegistry::PLATFORM_ANDROID, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
@@ -316,14 +317,14 @@ void ContentSettingsRegistry::Init() { |
Register(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "protocol-handler", |
CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE, |
WhitelistedSchemes(), ValidSettings(), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |
Register(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script", |
CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE, |
WhitelistedSchemes(), ValidSettings(), |
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE, |
WebsiteSettingsRegistry::DESKTOP, |
ContentSettingsInfo::INHERIT_IN_INCOGNITO); |