components/content_settings/core/browser/content_settings_policy_provider.cc - Issue 965103004: Stop using the MEDIASTREAM content setting.

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

Issue 965103004: Stop using the MEDIASTREAM content setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated policy Created 5 years, 10 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/ui/webui/options/content_settings_handler.cc ('K') | « chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc ('k') | components/content_settings/core/browser/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_policy_provider.cc

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

index 9711640657a6a9fec82c80f3cfd77c833a22483a..445a4ad817acb9dc3245632123203392d074ecd2 100644

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

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

@@ -32,9 +32,9 @@ const char* kPrefToManageType[] = {

NULL, // No policy for default value of fullscreen requests

NULL, // No policy for default value of mouse lock requests

NULL, // No policy for default value of mixed script blocking

+ NULL, // The MEDIASTREAM setting is deprecated

+ prefs::kManagedDefaultMediaStreamSetting,

msramek 2015/03/05 16:19:38 If a policy sets kManagedDefaultMediaStreamSetting

prefs::kManagedDefaultMediaStreamSetting,

- NULL, // No policy for default value of media stream mic

- NULL, // No policy for default value of media stream camera

NULL, // No policy for default value of protocol handlers

NULL, // No policy for default value of PPAPI broker

NULL, // No policy for default value of multiple automatic downloads

@@ -466,7 +466,8 @@ void PolicyProvider::OnPreferenceChanged(const std::string& name) {

} else if (name == prefs::kManagedDefaultNotificationsSetting) {

UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);

} else if (name == prefs::kManagedDefaultMediaStreamSetting) {

- UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM);

+ UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);

+ UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);

} else if (name == prefs::kManagedAutoSelectCertificateForUrls ||

name == prefs::kManagedCookiesAllowedForUrls ||

name == prefs::kManagedCookiesBlockedForUrls ||