chrome/browser/extensions/api/content_settings/content_settings_helpers.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/extensions/api/content_settings/content_settings_helpers.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/browser/content_settings/content_settings_policy_provider.cc ('K') | « chrome/browser/extensions/api/content_settings/content_settings_apitest.cc ('k') | chrome/browser/prefs/pref_functional_browsertest.cc » ('j') | chrome/browser/prefs/pref_functional_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

index 6601abdb2debdd836562cd853adaa5115786ef58..c6bd975e966ad9e5e16b598f46fa7445260ec526 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

@@ -21,6 +21,7 @@ const char* const kContentSettingsTypeNames[] = {

"cookies",

"images",

"javascript",

+ "media",

"plugins",

"popups",

"location",