content/renderer/renderer_main.cc - Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef.

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 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase, fix gn for reals Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: content/renderer/renderer_main.cc

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

index 02d17e91d50d20a09f1caa5d887a6c6254dce209..dbe40235cabb0ba7ed839f0017a08e2ae13e4570 100644

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

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

@@ -27,7 +27,6 @@

#include "content/public/common/main_function_params.h"

#include "content/public/renderer/content_renderer_client.h"

#include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"

-#include "content/renderer/pepper/pepper_plugin_registry.h"

#include "content/renderer/render_process_impl.h"

#include "content/renderer/render_thread_impl.h"

#include "content/renderer/renderer_main_platform_delegate.h"

@@ -48,6 +47,10 @@

#include "third_party/WebKit/public/web/WebView.h"

#endif // OS_MACOSX

+#if defined(ENABLE_PLUGINS)

+#include "content/renderer/pepper/pepper_plugin_registry.h"

+#endif

#if defined(ENABLE_WEBRTC)

#include "third_party/libjingle/overrides/init_webrtc.h"

#endif

« content/renderer/render_thread_impl.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | content/utility/utility_thread_impl.h » ('j') | no next file with comments »