chrome/browser/content_settings/content_settings_default_provider.cc - Issue 27635002: Content settings for <audio> and <video>.

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 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fix. Created 6 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/app/generated_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('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 8673960f130427c0fe0d65481cb5e8e3ada120cb..bf4e1915e0300d828cca77f9111454db78fb89d5 100644

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

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

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

CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES

CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES

CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT

+ CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_MEDIA

CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS

CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION

@@ -135,6 +136,11 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

default_settings_[CONTENT_SETTINGS_TYPE_JAVASCRIPT].get()),

CONTENT_SETTING_NUM_SETTINGS);

UMA_HISTOGRAM_ENUMERATION(

+ "ContentSettings.DefaultMediaSetting",

+ ValueToContentSetting(

+ default_settings_[CONTENT_SETTINGS_TYPE_MEDIA].get()),

+ CONTENT_SETTING_NUM_SETTINGS);

+ UMA_HISTOGRAM_ENUMERATION(

"ContentSettings.DefaultPluginsSetting",

ValueToContentSetting(

default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get()),