| Index: chrome/browser/android/preferences/website_preference_bridge.cc
|
| diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
|
| index f044ab925c481192e41614036a5959918c5a7a7a..a0feb9bafdcf8e1b33498c10693747cd425563dc 100644
|
| --- a/chrome/browser/android/preferences/website_preference_bridge.cc
|
| +++ b/chrome/browser/android/preferences/website_preference_bridge.cc
|
| @@ -59,6 +59,7 @@ void GetOrigins(JNIEnv* env,
|
| InfoListInsertionFunction insertionFunc,
|
| jobject list,
|
| jboolean managedOnly) {
|
| + using ProviderType = HostContentSettingsMap::ProviderType;
|
| ContentSettingsForOneType all_settings;
|
| HostContentSettingsMap* content_settings_map =
|
| GetHostContentSettingsMap(false);
|
| @@ -70,10 +71,13 @@ void GetOrigins(JNIEnv* env,
|
| for (const auto& settings_it : all_settings) {
|
| if (settings_it.setting == default_content_setting)
|
| continue;
|
| - if (managedOnly &&
|
| - HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) !=
|
| - HostContentSettingsMap::ProviderType::POLICY_PROVIDER) {
|
| - continue;
|
| + if (managedOnly) {
|
| + ProviderType provider =
|
| + HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source);
|
| + if (provider != ProviderType::POLICY_PROVIDER &&
|
| + provider != ProviderType::RECOMMENDED_POLICY_PROVIDER) {
|
| + continue;
|
| + }
|
| }
|
| const std::string origin = settings_it.primary_pattern.ToString();
|
| const std::string embedder = settings_it.secondary_pattern.ToString();
|
| @@ -423,6 +427,7 @@ static void GetCookieOrigins(JNIEnv* env,
|
| const JavaParamRef<jclass>& clazz,
|
| const JavaParamRef<jobject>& list,
|
| jboolean managedOnly) {
|
| + using ProviderType = HostContentSettingsMap::ProviderType;
|
| ContentSettingsForOneType all_settings;
|
| GetCookieSettings()->GetCookieSettings(&all_settings);
|
| const ContentSetting default_setting =
|
| @@ -430,10 +435,13 @@ static void GetCookieOrigins(JNIEnv* env,
|
| for (const auto& settings_it : all_settings) {
|
| if (settings_it.setting == default_setting)
|
| continue;
|
| - if (managedOnly &&
|
| - HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) !=
|
| - HostContentSettingsMap::ProviderType::POLICY_PROVIDER) {
|
| - continue;
|
| + if (managedOnly) {
|
| + ProviderType provider =
|
| + HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source);
|
| + if (provider != ProviderType::POLICY_PROVIDER &&
|
| + provider != ProviderType::RECOMMENDED_POLICY_PROVIDER) {
|
| + continue;
|
| + }
|
| }
|
| const std::string& origin = settings_it.primary_pattern.ToString();
|
| const std::string& embedder = settings_it.secondary_pattern.ToString();
|
|
|