OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/shell/renderer/shell_content_renderer_client.h" | 5 #include "content/shell/renderer/shell_content_renderer_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "components/web_cache/renderer/web_cache_render_process_observer.h" | 8 #include "components/web_cache/renderer/web_cache_render_process_observer.h" |
9 #include "content/public/renderer/render_thread.h" | 9 #include "content/public/renderer/render_thread.h" |
10 #include "content/shell/renderer/shell_render_view_observer.h" | 10 #include "content/shell/renderer/shell_render_view_observer.h" |
11 #if defined(ENABLE_PLUGINS) | |
brettw
2015/12/01 18:01:37
Put conditional includes after the rest of the inc
agrieve
2015/12/01 18:41:50
Done.
| |
11 #include "ppapi/shared_impl/ppapi_switches.h" | 12 #include "ppapi/shared_impl/ppapi_switches.h" |
13 #endif | |
12 #include "third_party/WebKit/public/web/WebView.h" | 14 #include "third_party/WebKit/public/web/WebView.h" |
13 #include "v8/include/v8.h" | 15 #include "v8/include/v8.h" |
14 | 16 |
15 namespace content { | 17 namespace content { |
16 | 18 |
17 ShellContentRendererClient::ShellContentRendererClient() { | 19 ShellContentRendererClient::ShellContentRendererClient() { |
18 } | 20 } |
19 | 21 |
20 ShellContentRendererClient::~ShellContentRendererClient() { | 22 ShellContentRendererClient::~ShellContentRendererClient() { |
21 } | 23 } |
22 | 24 |
23 void ShellContentRendererClient::RenderThreadStarted() { | 25 void ShellContentRendererClient::RenderThreadStarted() { |
24 RenderThread* thread = RenderThread::Get(); | 26 RenderThread* thread = RenderThread::Get(); |
25 web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); | 27 web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); |
26 thread->AddObserver(web_cache_observer_.get()); | 28 thread->AddObserver(web_cache_observer_.get()); |
27 } | 29 } |
28 | 30 |
29 void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) { | 31 void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) { |
30 new ShellRenderViewObserver(render_view); | 32 new ShellRenderViewObserver(render_view); |
31 } | 33 } |
32 | 34 |
33 bool ShellContentRendererClient::IsPluginAllowedToUseCompositorAPI( | 35 bool ShellContentRendererClient::IsPluginAllowedToUseCompositorAPI( |
34 const GURL& url) { | 36 const GURL& url) { |
37 #if defined(ENABLE_PLUGINS) | |
35 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 38 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
36 switches::kEnablePepperTesting); | 39 switches::kEnablePepperTesting); |
40 #else | |
41 return false; | |
42 #endif | |
37 } | 43 } |
38 | 44 |
39 bool ShellContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() { | 45 bool ShellContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() { |
46 #if defined(ENABLE_PLUGINS) | |
40 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 47 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
41 switches::kEnablePepperTesting); | 48 switches::kEnablePepperTesting); |
49 #else | |
50 return false; | |
51 #endif | |
42 } | 52 } |
43 | 53 |
44 } // namespace content | 54 } // namespace content |
OLD | NEW |