chrome/browser/content_settings/content_settings_utils.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_utils.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:

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 27977f26bbff7f20a7a129f947970a54fb083dab..e564dd7a4db053f2eff0a060c10f75a22bd1d4be 100644

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

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

@@ -26,6 +26,7 @@ const char* kTypeNames[] = {

"cookies",

"images",

"javascript",

+ "media",

"plugins",

"popups",

"geolocation",

@@ -201,6 +202,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,

map->GetSettingsForOneType(

CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));

map->GetSettingsForOneType(

+ CONTENT_SETTINGS_TYPE_MEDIA, std::string(), &(rules->media_rules));

+ map->GetSettingsForOneType(

CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));

}