diff options
Diffstat (limited to 'chromium/components/content_settings')
6 files changed, 7 insertions, 32 deletions
diff --git a/chromium/components/content_settings/core/browser/content_settings_policy_provider.cc b/chromium/components/content_settings/core/browser/content_settings_policy_provider.cc index cacfdf9848e..ab56762c890 100644 --- a/chromium/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/chromium/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -73,6 +73,7 @@ struct PolicyProvider::PrefsForManagedDefaultMapEntry { // static const PolicyProvider::PrefsForManagedDefaultMapEntry PolicyProvider::kPrefsForManagedDefault[] = { + {CONTENT_SETTINGS_TYPE_ADS, prefs::kManagedDefaultAdsSetting}, {CONTENT_SETTINGS_TYPE_COOKIES, prefs::kManagedDefaultCookiesSetting}, {CONTENT_SETTINGS_TYPE_IMAGES, prefs::kManagedDefaultImagesSetting}, {CONTENT_SETTINGS_TYPE_GEOLOCATION, @@ -110,6 +111,8 @@ void PolicyProvider::RegisterProfilePrefs( registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls); // Preferences for default content setting policies. If a policy is not set of // the corresponding preferences below is set to CONTENT_SETTING_DEFAULT. + registry->RegisterIntegerPref(prefs::kManagedDefaultAdsSetting, + CONTENT_SETTING_DEFAULT); registry->RegisterIntegerPref(prefs::kManagedDefaultCookiesSetting, CONTENT_SETTING_DEFAULT); registry->RegisterIntegerPref(prefs::kManagedDefaultGeolocationSetting, @@ -162,6 +165,7 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) { // the preference default content settings. If a default content settings type // is managed any user defined exceptions (patterns) for this type are // ignored. + pref_change_registrar_.Add(prefs::kManagedDefaultAdsSetting, callback); pref_change_registrar_.Add(prefs::kManagedDefaultCookiesSetting, callback); pref_change_registrar_.Add( prefs::kManagedDefaultGeolocationSetting, callback); diff --git a/chromium/components/content_settings/core/browser/content_settings_pref_provider.cc b/chromium/components/content_settings/core/browser/content_settings_pref_provider.cc index 23f21feaaaa..62834c227f9 100644 --- a/chromium/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/chromium/components/content_settings/core/browser/content_settings_pref_provider.cc @@ -236,29 +236,6 @@ void PrefProvider::DiscardObsoletePreferences() { prefs_->ClearPref(kObsoleteMouseLockExceptionsPref); #endif // !defined(OS_ANDROID) #endif // !defined(OS_IOS) - -#if !defined(OS_IOS) - // Migrate CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT to - // CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA. - // TODO(raymes): See crbug.com/681709. Remove after M60. - const std::string prompt_no_decision_count_pref = - WebsiteSettingsRegistry::GetInstance() - ->Get(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT) - ->pref_name(); - const base::DictionaryValue* old_dict = - prefs_->GetDictionary(prompt_no_decision_count_pref); - - const std::string permission_autoblocker_data_pref = - WebsiteSettingsRegistry::GetInstance() - ->Get(CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA) - ->pref_name(); - const base::DictionaryValue* new_dict = - prefs_->GetDictionary(permission_autoblocker_data_pref); - - if (!old_dict->empty() && new_dict->empty()) - prefs_->Set(permission_autoblocker_data_pref, *old_dict); - prefs_->ClearPref(prompt_no_decision_count_pref); -#endif // !defined(OS_IOS) } void PrefProvider::SetClockForTesting(base::Clock* clock) { diff --git a/chromium/components/content_settings/core/browser/website_settings_registry.cc b/chromium/components/content_settings/core/browser/website_settings_registry.cc index 2987e165f53..b33ded94568 100644 --- a/chromium/components/content_settings/core/browser/website_settings_registry.cc +++ b/chromium/components/content_settings/core/browser/website_settings_registry.cc @@ -147,13 +147,6 @@ void WebsiteSettingsRegistry::Init() { WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, DESKTOP | PLATFORM_ANDROID, WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO); - // TODO(raymes): Deprecated. See crbug.com/681709. Remove after M60. - Register(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, - "prompt-no-decision-count", nullptr, WebsiteSettingsInfo::UNSYNCABLE, - WebsiteSettingsInfo::NOT_LOSSY, - WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, - DESKTOP | PLATFORM_ANDROID, - WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); Register(CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, "important-site-info", nullptr, WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY, WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, diff --git a/chromium/components/content_settings/core/common/content_settings_types.h b/chromium/components/content_settings/core/common/content_settings_types.h index 1f71c9097cc..ef4c1f0933c 100644 --- a/chromium/components/content_settings/core/common/content_settings_types.h +++ b/chromium/components/content_settings/core/common/content_settings_types.h @@ -43,8 +43,6 @@ enum ContentSettingsType { CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, CONTENT_SETTINGS_TYPE_AUTOPLAY, - // TODO(raymes): Deprecated. See crbug.com/681709. Remove after M60. - CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, CONTENT_SETTINGS_TYPE_ADS, diff --git a/chromium/components/content_settings/core/common/pref_names.cc b/chromium/components/content_settings/core/common/pref_names.cc index bf28841834b..0e5cf8c5dcc 100644 --- a/chromium/components/content_settings/core/common/pref_names.cc +++ b/chromium/components/content_settings/core/common/pref_names.cc @@ -20,6 +20,8 @@ const char kContentSettingsWindowLastTabIndex[] = // Preferences that are exclusively used to store managed values for default // content settings. +const char kManagedDefaultAdsSetting[] = + "profile.managed_default_content_settings.ads"; const char kManagedDefaultCookiesSetting[] = "profile.managed_default_content_settings.cookies"; const char kManagedDefaultGeolocationSetting[] = diff --git a/chromium/components/content_settings/core/common/pref_names.h b/chromium/components/content_settings/core/common/pref_names.h index b030680adc7..1736ef0e958 100644 --- a/chromium/components/content_settings/core/common/pref_names.h +++ b/chromium/components/content_settings/core/common/pref_names.h @@ -17,6 +17,7 @@ extern const char kBlockThirdPartyCookies[]; extern const char kContentSettingsVersion[]; extern const char kContentSettingsWindowLastTabIndex[]; +extern const char kManagedDefaultAdsSetting[]; extern const char kManagedDefaultCookiesSetting[]; extern const char kManagedDefaultImagesSetting[]; extern const char kManagedDefaultJavaScriptSetting[]; |