| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/android/preferences/website_preference_bridge.h" | 5 #include "chrome/browser/android/preferences/website_preference_bridge.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, std::string(), | 132 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, std::string(), |
| 133 &embargo_settings); | 133 &embargo_settings); |
| 134 ContentSetting default_content_setting = content_settings_map-> | 134 ContentSetting default_content_setting = content_settings_map-> |
| 135 GetDefaultContentSetting(content_type, NULL); | 135 GetDefaultContentSetting(content_type, NULL); |
| 136 | 136 |
| 137 // Use a vector since the overall number of origins should be small. | 137 // Use a vector since the overall number of origins should be small. |
| 138 std::vector<std::string> seen_origins; | 138 std::vector<std::string> seen_origins; |
| 139 | 139 |
| 140 // Now add all origins that have a non-default setting to the list. | 140 // Now add all origins that have a non-default setting to the list. |
| 141 for (const auto& settings_it : all_settings) { | 141 for (const auto& settings_it : all_settings) { |
| 142 if (settings_it.setting == default_content_setting) | 142 if (settings_it.GetContentSetting() == default_content_setting) |
| 143 continue; | 143 continue; |
| 144 if (managedOnly && | 144 if (managedOnly && |
| 145 HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) != | 145 HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) != |
| 146 HostContentSettingsMap::ProviderType::POLICY_PROVIDER) { | 146 HostContentSettingsMap::ProviderType::POLICY_PROVIDER) { |
| 147 continue; | 147 continue; |
| 148 } | 148 } |
| 149 const std::string origin = settings_it.primary_pattern.ToString(); | 149 const std::string origin = settings_it.primary_pattern.ToString(); |
| 150 const std::string embedder = settings_it.secondary_pattern.ToString(); | 150 const std::string embedder = settings_it.secondary_pattern.ToString(); |
| 151 | 151 |
| 152 ScopedJavaLocalRef<jstring> jembedder; | 152 ScopedJavaLocalRef<jstring> jembedder; |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 const JavaParamRef<jstring>& jorigin) { | 828 const JavaParamRef<jstring>& jorigin) { |
| 829 GURL url(ConvertJavaStringToUTF8(env, jorigin)); | 829 GURL url(ConvertJavaStringToUTF8(env, jorigin)); |
| 830 return !!GetHostContentSettingsMap(false)->GetWebsiteSetting( | 830 return !!GetHostContentSettingsMap(false)->GetWebsiteSetting( |
| 831 url, GURL(), CONTENT_SETTINGS_TYPE_ADS_DATA, std::string(), nullptr); | 831 url, GURL(), CONTENT_SETTINGS_TYPE_ADS_DATA, std::string(), nullptr); |
| 832 } | 832 } |
| 833 | 833 |
| 834 // Register native methods | 834 // Register native methods |
| 835 bool RegisterWebsitePreferenceBridge(JNIEnv* env) { | 835 bool RegisterWebsitePreferenceBridge(JNIEnv* env) { |
| 836 return RegisterNativesImpl(env); | 836 return RegisterNativesImpl(env); |
| 837 } | 837 } |
| OLD | NEW |