components/content_settings/core/browser/content_settings_registry.h - Issue 1991623005: Only Register() platform specific content settings types on different platforms

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1991623005: Only Register() platform specific content settings types on different platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: split the changes and register images, plugins, mouselock in this CL Created 4 years, 6 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 | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_registry.h

diff --git a/components/content_settings/core/browser/content_settings_registry.h b/components/content_settings/core/browser/content_settings_registry.h

index b26ca399f54ace80d62e068f1b8480773ef58a7b..84b4b514bf402d2bccc238bafd5acaf5ebf8bb58 100644

--- a/components/content_settings/core/browser/content_settings_registry.h

+++ b/components/content_settings/core/browser/content_settings_registry.h

@@ -54,6 +54,8 @@ class ContentSettingsRegistry {

void Init();

+ typedef uint32_t Platforms;

// Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK

// value (see the ContentSetting enum).

void Register(ContentSettingsType type,

@@ -63,6 +65,7 @@ class ContentSettingsRegistry {

const std::vector<std::string>& whitelisted_schemes,

const std::set<ContentSetting>& valid_settings,

WebsiteSettingsInfo::ScopingType scoping_type,

+ Platforms platforms,

ContentSettingsInfo::IncognitoBehavior incognito_behavior);

Map content_settings_info_;