| 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 9dc431dadad56a2b83b36573a8d684f67e433dfd..763757fc2108d7ff1168b86a69f9143586332f89 100644
|
| --- a/chrome/browser/ui/webui/site_settings_helper.cc
|
| +++ b/chrome/browser/ui/webui/site_settings_helper.cc
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/usb/usb_chooser_context_factory.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| +#include "components/content_settings/core/common/content_settings_utils.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "extensions/browser/extension_registry.h"
|
|
|
| @@ -201,8 +202,9 @@ void GetExceptionsFromHostContentSettingsMap(
|
| if (filter && i->primary_pattern.ToString() != *filter)
|
| continue;
|
|
|
| - all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
|
| - [i->secondary_pattern] = i->setting;
|
| + all_patterns_settings[std::make_pair(i->primary_pattern,
|
| + i->source)][i->secondary_pattern] =
|
| + content_settings::ValueToContentSetting(i->setting_value.get());
|
| }
|
|
|
| // Keep the exceptions sorted by provider so they will be displayed in
|
|
|