chrome/browser/content_settings/content_settings_default_provider.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_default_provider.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/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/resources/options2/content_settings.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

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

index 8dc963038367e5ba66aa6968322d25849e7bf120..5edfcd427684af4c148fa1e3a6a4e16aa0bfbd95 100644

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

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

@@ -43,6 +43,7 @@ const ContentSetting kDefaultSettings[] = {

CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK

+ CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM

};

COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,

default_settings_incorrect_size);

@@ -157,6 +158,11 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

ValueToContentSetting(

default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()),

CONTENT_SETTING_NUM_SETTINGS);

+ UMA_HISTOGRAM_ENUMERATION(

+ "ContentSettings.DefaultMediaStreamSetting",

+ ValueToContentSetting(

+ default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()),

+ CONTENT_SETTING_NUM_SETTINGS);

pref_change_registrar_.Init(prefs_);

pref_change_registrar_.Add(prefs::kDefaultContentSettings, this);