chrome/browser/content_settings/host_content_settings_map.cc - Issue 10826164: Add infobar for PPAPI broker usage.

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/content_settings/host_content_settings_map.cc

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix merge Created 8 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: chrome/browser/content_settings/host_content_settings_map.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc

index 39be5d4c43fbc864e6638b84743ec8be7603e6d3..9ed9c1701a31ef9c593edc0da984b2724de7e16d 100644

--- a/chrome/browser/content_settings/host_content_settings_map.cc

+++ b/chrome/browser/content_settings/host_content_settings_map.cc

@@ -358,6 +358,7 @@ bool HostContentSettingsMap::IsSettingAllowedForType(

case CONTENT_SETTINGS_TYPE_INTENTS:

case CONTENT_SETTINGS_TYPE_MOUSELOCK:

case CONTENT_SETTINGS_TYPE_MEDIASTREAM:

+ case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:

return setting == CONTENT_SETTING_ASK;

default:

return false;