| 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 1bfb00072813e11dd38ca0433813e6aac90986ad..8df91fab61c4d9027f465a43c404e6a5663ca42a 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)
|
| @@ -1027,10 +1030,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.
|
| @@ -1068,7 +1071,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
|
| GetContentClient()->browser()->AppendExtraCommandLineSwitches(
|
| command_line, GetID());
|
|
|
| - if (content::IsPinchToZoomEnabled())
|
| + if (IsPinchToZoomEnabled())
|
| command_line->AppendSwitch(switches::kEnablePinch);
|
|
|
| #if defined(OS_WIN)
|
|
|