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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, std::string(), | 133 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, std::string(), |
134 &embargo_settings); | 134 &embargo_settings); |
135 ContentSetting default_content_setting = content_settings_map-> | 135 ContentSetting default_content_setting = content_settings_map-> |
136 GetDefaultContentSetting(content_type, NULL); | 136 GetDefaultContentSetting(content_type, NULL); |
137 | 137 |
138 // Use a vector since the overall number of origins should be small. | 138 // Use a vector since the overall number of origins should be small. |
139 std::vector<std::string> seen_origins; | 139 std::vector<std::string> seen_origins; |
140 | 140 |
141 // Now add all origins that have a non-default setting to the list. | 141 // Now add all origins that have a non-default setting to the list. |
142 for (const auto& settings_it : all_settings) { | 142 for (const auto& settings_it : all_settings) { |
143 if (settings_it.setting == default_content_setting) | 143 if (settings_it.GetContentSetting() == default_content_setting) |
144 continue; | 144 continue; |
145 if (managedOnly && | 145 if (managedOnly && |
146 HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) != | 146 HostContentSettingsMap::GetProviderTypeFromSource(settings_it.source) != |
147 HostContentSettingsMap::ProviderType::POLICY_PROVIDER) { | 147 HostContentSettingsMap::ProviderType::POLICY_PROVIDER) { |
148 continue; | 148 continue; |
149 } | 149 } |
150 const std::string origin = settings_it.primary_pattern.ToString(); | 150 const std::string origin = settings_it.primary_pattern.ToString(); |
151 const std::string embedder = settings_it.secondary_pattern.ToString(); | 151 const std::string embedder = settings_it.secondary_pattern.ToString(); |
152 | 152 |
153 ScopedJavaLocalRef<jstring> jembedder; | 153 ScopedJavaLocalRef<jstring> jembedder; |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 const JavaParamRef<jstring>& jorigin) { | 837 const JavaParamRef<jstring>& jorigin) { |
838 GURL url(ConvertJavaStringToUTF8(env, jorigin)); | 838 GURL url(ConvertJavaStringToUTF8(env, jorigin)); |
839 return !!GetHostContentSettingsMap(false)->GetWebsiteSetting( | 839 return !!GetHostContentSettingsMap(false)->GetWebsiteSetting( |
840 url, GURL(), CONTENT_SETTINGS_TYPE_ADS_DATA, std::string(), nullptr); | 840 url, GURL(), CONTENT_SETTINGS_TYPE_ADS_DATA, std::string(), nullptr); |
841 } | 841 } |
842 | 842 |
843 // Register native methods | 843 // Register native methods |
844 bool RegisterWebsitePreferenceBridge(JNIEnv* env) { | 844 bool RegisterWebsitePreferenceBridge(JNIEnv* env) { |
845 return RegisterNativesImpl(env); | 845 return RegisterNativesImpl(env); |
846 } | 846 } |
OLD | NEW |