chrome/browser/plugins/flash_permission_context.cc - Issue 2376603002: Add checks that ensure flash isn't exposed to a page if an enterprise ASK setting is in effect

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/plugins/flash_permission_context.cc

Issue 2376603002: Add checks that ensure flash isn't exposed to a page if an enterprise ASK setting is in effect (Closed)

Patch Set: Add checks that ensure flash isn't exposed to a page if an enterprise ASK setting is in effect Created 4 years, 3 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/plugins/flash_permission_context.cc

diff --git a/chrome/browser/plugins/flash_permission_context.cc b/chrome/browser/plugins/flash_permission_context.cc

index 38c8ccb3e158ada216cba160600a540f34561025..941edbb2d2b36710139fbb330bb3b6594ad963c0 100644

--- a/chrome/browser/plugins/flash_permission_context.cc

+++ b/chrome/browser/plugins/flash_permission_context.cc

@@ -25,7 +25,7 @@ ContentSetting FlashPermissionContext::GetPermissionStatus(

const GURL& embedding_origin) const {

ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(

HostContentSettingsMapFactory::GetForProfile(profile()), embedding_origin,

- requesting_origin);

+ requesting_origin, nullptr);

flash_setting = PluginsFieldTrial::EffectiveContentSetting(

CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);

if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)