components/content_settings/core/browser/content_settings_registry.cc - Issue 2123863004: ScreenCapture for Android phase1, part II

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.cc

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments and rebase Created 4 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

« chrome/browser/android/tab_web_contents_delegate_android.cc ('K') | « chrome/browser/permissions/grouped_permission_infobar_delegate.cc ('k') | components/content_settings/core/browser/content_settings_registry_unittest.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.cc

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

index c104f672a582c8a27680ef666e6657c9c9972af8..681fe053208a6bdb4993f0173dd40c32e193fcf7 100644

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

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

@@ -325,6 +325,13 @@ void ContentSettingsRegistry::Init() {

WebsiteSettingsRegistry::DESKTOP |

WebsiteSettingsRegistry::PLATFORM_ANDROID,

ContentSettingsInfo::INHERIT_IN_INCOGNITO);

+ Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN, "media-stream-screen",

+ CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,

+ WhitelistedSchemes(), ValidSettings(),

+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

+ WebsiteSettingsRegistry::PLATFORM_ANDROID,

+ ContentSettingsInfo::INHERIT_IN_INCOGNITO);

}

void ContentSettingsRegistry::Register(