content/renderer/renderer_main.cc - Issue 11615002: Exclude PluginService for builds with enable_plugins==0

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/renderer/renderer_main.cc

Issue 11615002: Exclude PluginService for builds with enable_plugins==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years 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/renderer/renderer_main.cc

diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc

index 245064821a240e55dfd63bf4874e1e19d5a2d537..d9bd58e201899d04bb9a661d84490035dcf3436e 100644

--- a/content/renderer/renderer_main.cc

+++ b/content/renderer/renderer_main.cc

@@ -201,8 +201,10 @@ int RendererMain(const MainFunctionParams& parameters) {

DCHECK(ret);

}

+#if defined(ENABLE_PLUGINS)

// Load pepper plugins before engaging the sandbox.

PepperPluginRegistry::GetInstance();

+#endif

{

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