| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index 2906e77f0d2d805215b63bd2a352c525cf788f65..b254d75d431321d9148849393afc86bb24bfdd70 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/native_pixmap_manager.h"
|
| +#endif
|
| +
|
| #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
|
| extern "C" {
|
| int tc_set_new_mode(int mode);
|
| @@ -683,6 +687,13 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| SetupCRT(command_line);
|
| #endif
|
|
|
| +#if defined(USE_OZONE)
|
| + if (process_type == switches::kRendererProcess) {
|
| + native_pixmap_manager_ = ui::NativePixmapManager::Create();
|
| + ui::NativePixmapManager::SetInstance(native_pixmap_manager_.get());
|
| + }
|
| +#endif
|
| +
|
| #if defined(OS_POSIX)
|
| if (!process_type.empty()) {
|
| // When you hit Ctrl-C in a terminal running the browser
|
| @@ -863,6 +874,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| #elif defined(OS_MACOSX)
|
| scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
|
| #endif
|
| +#if defined(USE_OZONE)
|
| + scoped_ptr<ui::NativePixmapManager> native_pixmap_manager_;
|
| +#endif
|
|
|
| base::Closure* ui_task_;
|
|
|
|
|