| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 8ca5ddd32b3c8e9a1cd8a0628ab95f78b7160436..0dc52fcaf88e98e2dcf3b4a4858b357f8210f0ad 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -145,10 +145,6 @@
|
| #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
|
| #endif
|
|
|
| -#if defined(USE_OZONE)
|
| -#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
|
| -#endif
|
| -
|
| #if defined(OS_WIN)
|
| #include <windows.h>
|
| #include <commctrl.h>
|
| @@ -771,12 +767,6 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
|
| }
|
| #endif
|
|
|
| -#if defined(USE_OZONE)
|
| - client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
|
| - gfx::ClientNativePixmapFactory::SetInstance(
|
| - client_native_pixmap_factory_.get());
|
| -#endif
|
| -
|
| if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
|
| TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
|
| memory_observer_.reset(new MemoryObserver());
|
|
|