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