chrome/browser/extensions/api/content_settings/content_settings_helpers.cc - Issue 880223002: Expose microphone content setting to extensions.

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 880223002: Expose microphone content setting to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed 11th setting. Created 5 years, 11 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/extensions/api/content_settings/content_settings_apitest.cc ('k') | chrome/common/extensions/api/content_settings.json » ('j') | no next file with comments »
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 7730dc2da835e10ff590804c01d7f6095fdc0d96..8ae97b154d1d212078cd47cbf389c8e3a97bf197 100644

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

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

@@ -27,11 +27,14 @@ const char* const kContentSettingsTypeNames[] = {

"notifications",

"auto-select-certificate",

"fullscreen",

- "mouselock"

+ "mouselock",

+ "mixed-script",

+ "media-stream",

+ "media-stream-mic"

};

-// TODO(msramek): Assert that |kContentSettingsTypeNames| is synced with enum

-// |ContentSettingsType| and mapping in |kContentSettingsTypeGroupNames|.

+// TODO(msramek): Assert that |kContentSettingsTypeNames| is synced with

+// enum |ContentSettingsType|.

static_assert(arraysize(kContentSettingsTypeNames) <=

CONTENT_SETTINGS_NUM_TYPES,

"kContentSettingsTypeNames has an unexpected number of elements");