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

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased 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/page_info/page_info.cc ('k') | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index d96f4458f34b393a37ac7d1fd85affb761b806b9..074fa9710d78d3b30169de6b552eedc875984fbf 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -838,7 +838,7 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
continue;
}
all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
- [i->secondary_pattern] = i->setting;
+ [i->secondary_pattern] = i->GetContentSetting();
}
base::ListValue exceptions;
@@ -909,11 +909,9 @@ void ContentSettingsHandler::UpdateNotificationExceptionsView() {
continue;
}
- exceptions.Append(
- GetNotificationExceptionForPage(i->primary_pattern,
- i->secondary_pattern,
- i->setting,
- i->source));
+ exceptions.Append(GetNotificationExceptionForPage(
+ i->primary_pattern, i->secondary_pattern, i->GetContentSetting(),
+ i->source));
}
base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
« no previous file with comments | « chrome/browser/ui/page_info/page_info.cc ('k') | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698