Index: content/app/content_main_runner.cc |
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc |
index df069e87e07a6c77125fe6af3f16f93918126926..b518f4f2b32e996d0aa65932ae40e9578e65a4d8 100644 |
--- a/content/app/content_main_runner.cc |
+++ b/content/app/content_main_runner.cc |
@@ -110,6 +110,10 @@ |
#endif // OS_POSIX |
+#if defined(USE_OZONE) |
+#include "ui/ozone/public/client_pixmap_manager.h" |
+#endif |
+ |
#if !defined(OS_MACOSX) && defined(USE_TCMALLOC) |
extern "C" { |
int tc_set_new_mode(int mode); |
@@ -666,6 +670,13 @@ class ContentMainRunnerImpl : public ContentMainRunner { |
SetupCRT(command_line); |
#endif |
+#if defined(USE_OZONE) |
+ if (process_type == switches::kRendererProcess) { |
+ client_pixmap_manager_ = ui::ClientPixmapManager::Create(); |
+ ui::ClientPixmapManager::SetInstance(client_pixmap_manager_.get()); |
+ } |
+#endif |
+ |
#if defined(OS_POSIX) |
if (!process_type.empty()) { |
// When you hit Ctrl-C in a terminal running the browser |
@@ -846,6 +857,9 @@ class ContentMainRunnerImpl : public ContentMainRunner { |
#elif defined(OS_MACOSX) |
scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; |
#endif |
+#if defined(USE_OZONE) |
+ scoped_ptr<ui::ClientPixmapManager> client_pixmap_manager_; |
+#endif |
base::Closure* ui_task_; |