content/shell/app/shell_main_delegate.cc - Issue 645203002: Block NPAPI plugins by default

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: content/shell/app/shell_main_delegate.cc

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reorder initializers for clang Created 6 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: content/shell/app/shell_main_delegate.cc

diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc

index a3d7331ba31003deb9016318cf96bab4d893022d..5878807136460eb9c2aa1e0a8e3b364ada69248d 100644

--- a/content/shell/app/shell_main_delegate.cc

+++ b/content/shell/app/shell_main_delegate.cc

@@ -185,6 +185,11 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {

command_line.AppendSwitchASCII(switches::kHostResolverRules,

"MAP *.test 127.0.0.1");

+#if defined(OS_WIN) || defined(OS_MACOSX)

+ // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone.

+ command_line.AppendSwitch(switches::kEnableNpapi);

+#endif

// Unless/until WebM files are added to the media layout tests, we need to

// avoid removing MP4/H264/AAC so that layout tests can run on Android.

#if !defined(OS_ANDROID)