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

Unified Diff: components/content_settings/core/browser/host_content_settings_map.h

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: components/content_settings/core/browser/host_content_settings_map.h
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
index 79c22bc9b09c785630fd000c5cab7af773c95e8a..e7a1a493304ff38830e4654af18936eb76f2ba5e 100644
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -152,24 +152,15 @@ class HostContentSettingsMap : public content_settings::Observer,
const std::string& resource_identifier,
base::Value* value);
- // Sets the most specific rule that currently defines the permission for the
- // given permission type.
- void SetNarrowestWebsiteSetting(
- const ContentSettingsPattern& primary_pattern,
- const ContentSettingsPattern& secondary_pattern,
- ContentSettingsType content_type,
- const std::string& resource_identifier,
- ContentSetting setting,
- content_settings::SettingInfo existing_info);
-
- // Convenience method to add a content setting for the given URLs, making sure
- // that there is no setting overriding it.
- //
- // This should only be called on the UI thread.
- void AddExceptionForURL(const GURL& primary_url,
- const GURL& secondary_url,
- ContentSettingsType content_type,
- ContentSetting setting);
+ // Sets the most specific rule that currently defines the setting for the
+ // given content type. TODO(raymes): Remove this once all content settings
+ // are scoped to origin scope. There is no scope more narrow than origin
+ // scope, so we can just blindly set the value of the origin scope when that
+ // happens.
+ void SetNarrowestContentSetting(const GURL& primary_url,
+ const GURL& secondary_url,
+ ContentSettingsType type,
+ ContentSetting setting);
// Clears all host-specific settings for one content type.
//

Powered by Google App Engine
This is Rietveld 408576698