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

Unified Diff: chrome/browser/dom_ui/content_settings_handler.cc

Issue 2878075: Introduce a resource identifier for content settings. (Closed)
Patch Set: updates Created 10 years, 4 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
Index: chrome/browser/dom_ui/content_settings_handler.cc
diff --git a/chrome/browser/dom_ui/content_settings_handler.cc b/chrome/browser/dom_ui/content_settings_handler.cc
index a40d7e11b3cbbe08ae6ff5268dc3a3120c03c64b..08841e164f2c7b457d9b8cede070fcf96c23a811 100644
--- a/chrome/browser/dom_ui/content_settings_handler.cc
+++ b/chrome/browser/dom_ui/content_settings_handler.cc
@@ -261,7 +261,8 @@ void ContentSettingsHandler::UpdateImagesExceptionsViewFromModel() {
HostContentSettingsMap::SettingsForOneType entries;
const HostContentSettingsMap* settings_map =
dom_ui_->GetProfile()->GetHostContentSettingsMap();
- settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, &entries);
+ settings_map->GetSettingsForOneType(
+ CONTENT_SETTINGS_TYPE_IMAGES, "", &entries);
ListValue exceptions;
for (size_t i = 0; i < entries.size(); ++i) {
@@ -326,6 +327,7 @@ void ContentSettingsHandler::RemoveExceptions(const Value* value) {
DCHECK(rv);
settings_map->SetContentSetting(HostContentSettingsMap::Pattern(pattern),
CONTENT_SETTINGS_TYPE_IMAGES,
+ "",
CONTENT_SETTING_DEFAULT);
}
}
@@ -345,5 +347,6 @@ void ContentSettingsHandler::SetException(const Value* value) {
dom_ui_->GetProfile()->GetHostContentSettingsMap();
settings_map->SetContentSetting(HostContentSettingsMap::Pattern(pattern),
CONTENT_SETTINGS_TYPE_IMAGES,
+ "",
ContentSettingFromString(setting));
}
« no previous file with comments | « chrome/browser/cookies_tree_model_unittest.cc ('k') | chrome/browser/gtk/options/content_exceptions_window_gtk_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698