chrome/browser/content_settings/content_settings_utils.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/content_settings/content_settings_utils.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: addressed comments from joaodasilva and bauerb, added support to Incognito mode. 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

« chrome/browser/content_settings/content_settings_pref_provider.cc ('K') | « chrome/browser/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/content_settings/host_content_settings_map.h » ('j') | chrome/browser/media/media_stream_devices_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_utils.cc

diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc

index 6eefa4c2b0d94b705f28f15decb5d4e267778c9b..48cadfc072f70f29dfd54e9907443ee5e42333c5 100644

--- a/chrome/browser/content_settings/content_settings_utils.cc

+++ b/chrome/browser/content_settings/content_settings_utils.cc

@@ -33,7 +33,8 @@ const char* kTypeNames[] = {

"intents",

"auto-select-certificate",

"fullscreen",

- "mouselock"

+ "mouselock",

+ "media-stream"

};

COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,

type_names_incorrect_size);