chrome/browser/ui/webui/options/content_settings_handler.cc - 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/browser/ui/webui/options/content_settings_handler.cc

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, 1 month 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/browser/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index d514c516f546e8728c8aa01a25af22b4d99b0d32..c2545b40080a225865b5ac8b0770dc54fa778de0 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -713,6 +713,10 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel(

case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:

break;

#endif

+#if defined(OS_CHROMEOS)

+ case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

+ break;

+#endif

default:

UpdateExceptionsViewFromHostContentSettingsMap(type);

break;