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

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: adopt base::Feature instead of switches Created 4 years, 3 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
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 1b96d20dcffe207aae9fc1d59868a33cd9a7e5dc..23d1b457189f5baf6d1117ae2e59ab7c6208a891 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",
raymes 2016/09/13 03:08:39 Could we call it CONTNET_SETTING_TYPE_SCREEN_CAPTU
+ CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
+ WhitelistedSchemes(), ValidSettings(),
raymes 2016/09/13 03:08:39 It's strange to have an empty ValidSettings. That
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
+ WebsiteSettingsRegistry::PLATFORM_ANDROID,
+ ContentSettingsInfo::INHERIT_IN_INCOGNITO);
}
void ContentSettingsRegistry::Register(

Powered by Google App Engine
This is Rietveld 408576698