Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4847)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/site_settings_helper.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: raymes comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | components/content_settings/core/common/content_settings.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..67fd9905de28d102062a913b7171e3f389983a4d 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.h"
#include "components/prefs/pref_service.h"
#include "extensions/browser/extension_registry.h"
@@ -202,7 +203,7 @@ void GetExceptionsFromHostContentSettingsMap(
continue;
all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
- [i->secondary_pattern] = i->setting;
+ [i->secondary_pattern] = i->GetContentSetting();
}
// Keep the exceptions sorted by provider so they will be displayed in
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | components/content_settings/core/common/content_settings.mojom » ('J')

Powered by Google App Engine
This is Rietveld 408576698