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

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

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review nits Created 5 years 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/content_settings_utils.h
diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
index 4cab07aefa504e14bbc769d99c5797ba2bd1abb7..acfb39ad57a876058960dc847db7d7a77439bc72 100644
--- a/components/content_settings/core/browser/content_settings_utils.h
+++ b/components/content_settings/core/browser/content_settings_utils.h
@@ -77,28 +77,10 @@ std::string CreatePatternString(
const ContentSettingsPattern& item_pattern,
const ContentSettingsPattern& top_level_frame_pattern);
-// Caller takes the ownership of the returned |base::Value*|.
-base::Value* GetContentSettingValueAndPatterns(
- RuleIterator* rule_iterator,
- const GURL& primary_url,
- const GURL& secondary_url,
- ContentSettingsPattern* primary_pattern,
- ContentSettingsPattern* secondary_pattern);
-
// Returns a |base::Value*| representation of |setting| if |setting| is
// a valid content setting. Otherwise, returns a nullptr.
scoped_ptr<base::Value> ContentSettingToValue(ContentSetting setting);
-base::Value* GetContentSettingValueAndPatterns(
- const ProviderInterface* provider,
- const GURL& primary_url,
- const GURL& secondary_url,
- ContentSettingsType content_type,
- const std::string& resource_identifier,
- bool include_incognito,
- ContentSettingsPattern* primary_pattern,
- ContentSettingsPattern* secondary_pattern);
-
// Populates |rules| with content setting rules for content types that are
// handled by the renderer.
void GetRendererContentSettingRules(const HostContentSettingsMap* map,

Powered by Google App Engine
This is Rietveld 408576698