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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10933091: Enable a minimal content/ build on iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@rohits-image-change
Patch Set: Rebase Created 8 years, 3 months 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/public/app/content_main_delegate.cc ('k') | content/public/test/unittest_test_suite.h » ('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 94cac28aa5a8d6e7d1f6a2e97b03434c0901a682..e8c3695a8aefa097f1a55697843e45df95a47339 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -7,9 +7,12 @@
#include "base/logging.h"
#include "base/string_piece.h"
#include "ui/gfx/image/image.h"
-#include "webkit/plugins/ppapi/host_globals.h"
#include "webkit/user_agent/user_agent.h"
+#if !defined(OS_IOS)
+#include "webkit/plugins/ppapi/host_globals.h"
+#endif
+
namespace content {
static ContentClient* g_client;
@@ -35,7 +38,11 @@ const std::string& GetUserAgent(const GURL& url) {
}
webkit::ppapi::HostGlobals* GetHostGlobals() {
+#if defined(OS_IOS)
+ return NULL;
+#else
return webkit::ppapi::HostGlobals::Get();
+#endif
}
ContentClient::ContentClient()
« no previous file with comments | « content/public/app/content_main_delegate.cc ('k') | content/public/test/unittest_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698