Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: content/browser/renderer_host/render_process_host_impl.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 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/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 2ed541ddf28542c8b5de4d6d0a6b5fef0bf1c562..58938cb80119ae5729b5845fc99775772cd6da09 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -70,7 +70,6 @@
#include "content/browser/message_port_message_filter.h"
#include "content/browser/mime_registry_message_filter.h"
#include "content/browser/mojo/mojo_application_host.h"
-#include "content/browser/plugin_service_impl.h"
#include "content/browser/profiler_message_filter.h"
#include "content/browser/push_messaging_message_filter.h"
#include "content/browser/quota_dispatcher_host.h"
@@ -168,6 +167,10 @@
#include "ui/gfx/win/dpi.h"
#endif
+#if defined(ENABLE_PLUGINS)
+#include "content/browser/plugin_service_impl.h"
+#endif
+
#if defined(ENABLE_WEBRTC)
#include "content/browser/media/webrtc_internals.h"
#include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
@@ -301,7 +304,7 @@ SiteProcessMap* GetSiteProcessMapForBrowserContext(BrowserContext* context) {
// NOTE: changes to this class need to be reviewed by the security team.
class RendererSandboxedProcessLauncherDelegate
- : public content::SandboxedProcessLauncherDelegate {
+ : public SandboxedProcessLauncherDelegate {
public:
explicit RendererSandboxedProcessLauncherDelegate(IPC::ChannelProxy* channel)
#if defined(OS_POSIX)
@@ -1026,10 +1029,10 @@ static void AppendCompositorCommandLineFlags(base::CommandLine* command_line) {
base::IntToString(NumberOfRendererRasterThreads()));
}
- if (content::IsGpuRasterizationEnabled())
+ if (IsGpuRasterizationEnabled())
command_line->AppendSwitch(switches::kEnableGpuRasterization);
- if (content::IsForceGpuRasterizationEnabled())
+ if (IsForceGpuRasterizationEnabled())
command_line->AppendSwitch(switches::kForceGpuRasterization);
// Appending disable-gpu-feature switches due to software rendering list.
@@ -1067,7 +1070,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
GetContentClient()->browser()->AppendExtraCommandLineSwitches(
command_line, GetID());
- if (content::IsPinchToZoomEnabled())
+ if (IsPinchToZoomEnabled())
command_line->AppendSwitch(switches::kEnablePinch);
#if defined(OS_WIN)
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698