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

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

Issue 1576073003: Support Audio for Desktop Capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style Fix Created 4 years, 11 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 c16c7830755e6d940cde67325019a5a63fbc0457..91cbd75813669171903b0f9e115afe71c9b5064d 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -262,6 +262,13 @@ void ContentSettingsRegistry::Init() {
WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
ContentSettingsInfo::INHERIT_IN_INCOGNITO);
+ Register(CONTENT_SETTINGS_TYPE_DESKTOP_AUDIO_SHARE, "desktop-audio-share",
raymes 2016/01/17 23:27:34 Could you please explain why the content setting i
qiangchen 2016/01/19 17:33:22 Sure. We are going to attach the audio stream when
msramek 2016/01/19 18:02:20 Drive by! Disclaimer: I'm not generally opposed to
qiangchen 2016/01/20 18:00:18 Thanks for your comment. Several options in my min
+ CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE,
+ WhitelistedSchemes(),
+ ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
+ ContentSettingsInfo::INHERIT_IN_INCOGNITO);
+
// Content settings that aren't used to store any data. TODO(raymes): use a
// different mechanism rather than content settings to represent these.
// Since nothing is stored in them, there is no real point in them being a
« no previous file with comments | « chrome/browser/ui/views/desktop_media_picker_views.cc ('k') | components/content_settings/core/common/content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698