| 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
|
| }
|
|
|
|
|