| Index: content/shell/renderer/shell_content_renderer_client.cc
|
| diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
|
| index 8ad5a68f3ea7e18843357fe348f8887b0cb89464..99badd7b4b2bd5cc13697a39aa39b9ee721796d3 100644
|
| --- a/content/shell/renderer/shell_content_renderer_client.cc
|
| +++ b/content/shell/renderer/shell_content_renderer_client.cc
|
| @@ -8,10 +8,13 @@
|
| #include "components/web_cache/renderer/web_cache_render_process_observer.h"
|
| #include "content/public/renderer/render_thread.h"
|
| #include "content/shell/renderer/shell_render_view_observer.h"
|
| -#include "ppapi/shared_impl/ppapi_switches.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "v8/include/v8.h"
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| +#include "ppapi/shared_impl/ppapi_switches.h"
|
| +#endif
|
| +
|
| namespace content {
|
|
|
| ShellContentRendererClient::ShellContentRendererClient() {
|
| @@ -32,13 +35,21 @@ void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) {
|
|
|
| bool ShellContentRendererClient::IsPluginAllowedToUseCompositorAPI(
|
| const GURL& url) {
|
| +#if defined(ENABLE_PLUGINS)
|
| return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnablePepperTesting);
|
| +#else
|
| + return false;
|
| +#endif
|
| }
|
|
|
| bool ShellContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() {
|
| +#if defined(ENABLE_PLUGINS)
|
| return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnablePepperTesting);
|
| +#else
|
| + return false;
|
| +#endif
|
| }
|
|
|
| } // namespace content
|
|
|