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

Unified Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 1417023007: Replace HostContentSettingsMap::AddExceptionForURL with SetNarrowestWebsiteSetting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index a62ecbe05b8299e22db765d673e87e4f36469814..a82135ae415194275bef9dde9d413e7b979441ea 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -268,47 +268,8 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
// compare it against other kinds of actions in WebsiteSettings[PopupView].
RecordWebsiteSettingsAction(WEBSITE_SETTINGS_CHANGED_PERMISSION);
- // TODO(raymes): The scoping here should be a property of ContentSettingsInfo.
- // Make this happen! crbug.com/444742.
- ContentSettingsPattern primary_pattern;
- ContentSettingsPattern secondary_pattern;
- if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION ||
- type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
- type == CONTENT_SETTINGS_TYPE_FULLSCREEN) {
- // TODO(markusheintz): The rule we create here should also change the
- // location permission for iframed content.
- primary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
- secondary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
- } else if (type == CONTENT_SETTINGS_TYPE_IMAGES ||
- type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
- type == CONTENT_SETTINGS_TYPE_PLUGINS ||
- type == CONTENT_SETTINGS_TYPE_POPUPS ||
- type == CONTENT_SETTINGS_TYPE_MOUSELOCK ||
- type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||
- type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {
- primary_pattern = ContentSettingsPattern::FromURL(site_url_);
- secondary_pattern = ContentSettingsPattern::Wildcard();
- } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
- type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
- type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
- primary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
- secondary_pattern = ContentSettingsPattern::Wildcard();
- } else {
- NOTREACHED() << "ContentSettingsType " << type << "is not supported.";
- }
-
- // Permission settings are specified via rules. There exists always at least
- // one rule for the default setting. Get the rule that currently defines
- // the permission for the given permission |type|. Then test whether the
- // existing rule is more specific than the rule we are about to create. If
- // the existing rule is more specific, than change the existing rule instead
- // of creating a new rule that would be hidden behind the existing rule.
- content_settings::SettingInfo info;
- scoped_ptr<base::Value> v =
- content_settings_->GetWebsiteSetting(
- site_url_, site_url_, type, std::string(), &info);
- content_settings_->SetNarrowestWebsiteSetting(
- primary_pattern, secondary_pattern, type, std::string(), setting, info);
+ content_settings_->SetNarrowestContentSetting(site_url_, site_url_, type,
+ setting);
show_info_bar_ = true;

Powered by Google App Engine
This is Rietveld 408576698