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

Unified Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 1478633002: Removing references to //ppapi when is_android = true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make assert android-only Created 5 years, 1 month 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/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..a458650f7dd659dc32999a5413719af110d677c9 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -8,7 +8,9 @@
#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"
+#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.
#include "ppapi/shared_impl/ppapi_switches.h"
+#endif
#include "third_party/WebKit/public/web/WebView.h"
#include "v8/include/v8.h"
@@ -32,13 +34,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

Powered by Google App Engine
This is Rietveld 408576698