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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Remove debug logging 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
« content/browser/renderer_host/render_message_filter.cc ('K') | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | content/renderer/render_view_impl.cc » ('J')
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..d0430efee6b0c315244d6ae6afcf45fa37136272 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,7 +38,7 @@ const std::string& GetUserAgent(const GURL& url) {
}
webkit::ppapi::HostGlobals* GetHostGlobals() {
-#if defined(OS_IOS)
+#if !defined(ENABLE_PLUGINS)
jam 2012/12/19 01:55:15 nit: it's easier to read this if it's written the
nilesh 2012/12/19 21:07:44 Done.
return NULL;
#else
return webkit::ppapi::HostGlobals::Get();
« content/browser/renderer_host/render_message_filter.cc ('K') | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | content/renderer/render_view_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698