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