chrome/common/content_settings_types.h - Issue 31043008: Changed platform verification user consent logic to be per-domain.

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/common/content_settings_types.h

Issue 31043008: Changed platform verification user consent logic to be per-domain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browser_tests Created 7 years, 2 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/common/content_settings_types.h

diff --git a/chrome/common/content_settings_types.h b/chrome/common/content_settings_types.h

index cf091fe8f44696b10b21d8bd470b2233cc7342e6..12bb960fecf00b857c74f01efb8b81f3be60c095 100644

--- a/chrome/common/content_settings_types.h

+++ b/chrome/common/content_settings_types.h

@@ -32,7 +32,7 @@ enum ContentSettingsType {

CONTENT_SETTINGS_TYPE_SAVE_PASSWORD,

#if defined(OS_WIN)

CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,

-#elif defined(OS_ANDROID)

+#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)

CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,

#endif

CONTENT_SETTINGS_NUM_TYPES,