Index: components/content_settings/core/browser/website_settings_registry.cc |
diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc |
index 662141ecbb9aac7de93ca60674c7831b8571dc41..940e42192fee7b2b2dfd158944e8808af924f6cd 100644 |
--- a/components/content_settings/core/browser/website_settings_registry.cc |
+++ b/components/content_settings/core/browser/website_settings_registry.cc |
@@ -55,10 +55,12 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Register( |
scoped_ptr<base::Value> initial_default_value, |
WebsiteSettingsInfo::SyncStatus sync_status, |
WebsiteSettingsInfo::LossyStatus lossy_status, |
- WebsiteSettingsInfo::ScopingType scoping_type) { |
+ WebsiteSettingsInfo::ScopingType scoping_type, |
+ WebsiteSettingsInfo::IncognitoBehavior incognito_behavior) { |
WebsiteSettingsInfo* info = |
new WebsiteSettingsInfo(type, name, initial_default_value.Pass(), |
- sync_status, lossy_status, scoping_type); |
+ sync_status, lossy_status, scoping_type, |
+ incognito_behavior); |
website_settings_info_.set(info->type(), make_scoped_ptr(info)); |
return info; |
} |
@@ -83,20 +85,25 @@ void WebsiteSettingsRegistry::Init() { |
Register(CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, |
"auto-select-certificate", nullptr, WebsiteSettingsInfo::UNSYNCABLE, |
WebsiteSettingsInfo::NOT_LOSSY, |
- WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE); |
+ WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); |
Register(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions", |
nullptr, WebsiteSettingsInfo::UNSYNCABLE, |
WebsiteSettingsInfo::NOT_LOSSY, |
- WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE); |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); |
Register(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner", nullptr, |
WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY, |
- WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE); |
+ WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); |
Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr, |
WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY, |
- WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE); |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, |
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); |
Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr, |
WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY, |
- WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE); |
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, |
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); |
} |
} // namespace content_settings |