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: fix problem with adding content setting type Created 4 years, 5 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 e7a8dea8fb8ec22b5cf3d3140d5f3b24377e21b2..50fade5bb4900d0a25a94895328ed2d7835b6a45 100644

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

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

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

CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,

CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

CONTENT_SETTINGS_TYPE_AUTOPLAY,

+#if defined(OS_ANDROID)

raymes 2016/07/13 02:44:09 nit: I think we can remove the ifdef here

braveyao 2016/07/13 19:51:57 Done.

+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN,

+#endif

};

int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,