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

Unified Diff: chrome/browser/content_setting_bubble_model.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
« no previous file with comments | « chrome/browser/content_exceptions_table_model.cc ('k') | chrome/browser/cookie_modal_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_bubble_model.cc
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc
index 2b8e190acea9bbd8f00063b0eb32596e3a1f9785..6c1c13bb77c50caf7c928c13ef675973f851eb3f 100644
--- a/chrome/browser/content_setting_bubble_model.cc
+++ b/chrome/browser/content_setting_bubble_model.cc
@@ -166,7 +166,7 @@ class ContentSettingSingleRadioGroup : public ContentSettingTitleAndLinkModel {
radio_group.radio_items.push_back(radio_block_label);
radio_group.default_item =
profile()->GetHostContentSettingsMap()->GetContentSetting(url,
- content_type()) == CONTENT_SETTING_ALLOW ? 0 : 1;
+ content_type(), "") == CONTENT_SETTING_ALLOW ? 0 : 1;
set_radio_group(radio_group);
}
@@ -174,6 +174,7 @@ class ContentSettingSingleRadioGroup : public ContentSettingTitleAndLinkModel {
profile()->GetHostContentSettingsMap()->AddExceptionForURL(
bubble_content().radio_group.url,
content_type(),
+ "",
radio_index == 0 ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
}
};
« no previous file with comments | « chrome/browser/content_exceptions_table_model.cc ('k') | chrome/browser/cookie_modal_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698