Chromium Code Reviews| Index: chrome/browser/ui/webui/site_settings_helper.cc |
| diff --git a/chrome/browser/ui/webui/site_settings_helper.cc b/chrome/browser/ui/webui/site_settings_helper.cc |
| index 716baad3d1087f89e753e99151021bb8b29a4ba4..ad5253224806b3f17ded4a2a484dd8ddaffee772 100644 |
| --- a/chrome/browser/ui/webui/site_settings_helper.cc |
| +++ b/chrome/browser/ui/webui/site_settings_helper.cc |
| @@ -4,6 +4,10 @@ |
| #include "chrome/browser/ui/webui/site_settings_helper.h" |
| +#include <functional> |
| +#include <string> |
| +#include <utility> |
|
Finnur
2016/09/15 12:51:11
Is this the result of a clang IWYU tool?
Also, st
dschuyler
2016/09/15 20:35:28
Yes.
|
| + |
| #include "base/memory/ptr_util.h" |
| #include "base/values.h" |
| #include "chrome/browser/permissions/chooser_context_base.h" |
| @@ -104,6 +108,7 @@ void GetExceptionsFromHostContentSettingsMap(const HostContentSettingsMap* map, |
| ContentSettingsType type, |
| content::WebUI* web_ui, |
| bool incognito, |
| + const std::string* filter, |
| base::ListValue* exceptions) { |
| ContentSettingsForOneType entries; |
| map->GetSettingsForOneType(type, std::string(), &entries); |
| @@ -124,6 +129,9 @@ void GetExceptionsFromHostContentSettingsMap(const HostContentSettingsMap* map, |
| if (map->is_off_the_record() && !i->incognito) |
| continue; |
| + if (filter && i->primary_pattern.ToString() != *filter) |
| + continue; |
| + |
| all_patterns_settings[std::make_pair(i->primary_pattern, i->source)] |
| [i->secondary_pattern] = i->setting; |
| } |