OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/content_settings/content_settings_utils.h" | 5 #include "chrome/browser/content_settings/content_settings_utils.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 bool include_incognito) { | 183 bool include_incognito) { |
184 scoped_ptr<base::Value> value( | 184 scoped_ptr<base::Value> value( |
185 GetContentSettingValue(provider, primary_url, secondary_url, | 185 GetContentSettingValue(provider, primary_url, secondary_url, |
186 content_type, resource_identifier, | 186 content_type, resource_identifier, |
187 include_incognito)); | 187 include_incognito)); |
188 return ValueToContentSetting(value.get()); | 188 return ValueToContentSetting(value.get()); |
189 } | 189 } |
190 | 190 |
191 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 191 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
192 RendererContentSettingRules* rules) { | 192 RendererContentSettingRules* rules) { |
193 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", | 193 map->GetSettingsForOneType( |
194 &(rules->image_rules)); | 194 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
195 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", | 195 map->GetSettingsForOneType( |
196 &(rules->script_rules)); | 196 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
197 } | 197 } |
198 | 198 |
199 } // namespace content_settings | 199 } // namespace content_settings |
OLD | NEW |