components/content_settings/core/common/content_settings.cc - Issue 2123863004: ScreenCapture for Android phase1, part II

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: components/content_settings/core/common/content_settings.cc

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: UI tweaking and rebase Created 4 years, 4 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: components/content_settings/core/common/content_settings.cc

diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc

index b52c6c1c78e5a6b508fb976ce32a5dc8c43863f5..47b3fc801dbe94587cf6ce9c7a7a1b3d8c99a524 100644

--- a/components/content_settings/core/common/content_settings.cc

+++ b/components/content_settings/core/common/content_settings.cc

@@ -56,6 +56,7 @@ ContentSettingsType kHistogramOrder[] = {

CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,

CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

CONTENT_SETTINGS_TYPE_AUTOPLAY,

+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN,

};

int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,