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

Unified Diff: content/public/common/content_client.cc

Issue 11615002: Exclude PluginService for builds with enable_plugins==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/content_client.cc
diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc
index 99730545e51a276ff01927e1c00e430d92ab3775..d203e060464ddfb683d0812f21e81088bd3e5feb 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -9,7 +9,7 @@
#include "ui/gfx/image/image.h"
#include "webkit/user_agent/user_agent.h"
-#if !defined(OS_IOS)
+#if defined(ENABLE_PLUGINS)
#include "webkit/plugins/ppapi/host_globals.h"
#endif
@@ -38,10 +38,10 @@ const std::string& GetUserAgent(const GURL& url) {
}
webkit::ppapi::HostGlobals* GetHostGlobals() {
-#if defined(OS_IOS)
- return NULL;
-#else
+#if defined(ENABLE_PLUGINS)
return webkit::ppapi::HostGlobals::Get();
+#else
+ return NULL;
#endif
}
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698