chrome/browser/policy/configuration_policy_handler_list.cc - Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

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: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased, addressed comments from Ivan, let "block" apply before exceptions Created 8 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 | « chrome/browser/media/media_stream_devices_menu_model.cc ('k') | chrome/browser/resources/options2/content_settings.html » ('j') | chrome/browser/resources/options2/content_settings.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_handler_list.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc

index 23e19cc909f40fa0f31c40804b3fddd7b4125775..1db492f730a1203f935526c9141446f258f1f3ee 100644

--- a/chrome/browser/policy/configuration_policy_handler_list.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list.cc

@@ -285,6 +285,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {

{ key::kRestrictSigninToPattern,

prefs::kGoogleServicesUsernamePattern,

Value::TYPE_STRING },

+ { key::kDefaultMediaStreamSetting,

+ prefs::kManagedDefaultMediaStreamSetting,

+ Value::TYPE_INTEGER },

#if defined(OS_CHROMEOS)

{ key::kChromeOsLockOnIdleSuspend,