Source/core/html/HTMLPlugInElement.cpp - Issue 1318703002: Revert of Remove javaEnabled setting.

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: Source/core/html/HTMLPlugInElement.cpp

Issue 1318703002: Revert of Remove javaEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 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: Source/core/html/HTMLPlugInElement.cpp

diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp

index d1028321fb23aa75d0ba798b002c433cefa0e0bf..cde57a859cdcdc7988fd99d701bf3571e05cf17c 100644

--- a/Source/core/html/HTMLPlugInElement.cpp

+++ b/Source/core/html/HTMLPlugInElement.cpp

@@ -619,7 +619,7 @@

if (!settings)

return false;

- if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType))

+ if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType) && !settings->javaEnabled())

return false;

if (document().isSandboxed(SandboxPlugins))

« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/modules/plugins/NavigatorPlugins.h » ('j') | no next file with comments »