Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 203400ea7757b12c8581abdb4556a2f1bca2f863..581d203dcc447f2e1f7d5b74cefec63646ba826d 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -107,6 +107,10 @@ |
#include "content/browser/theme_helper_mac.h" |
#endif |
+#if defined(USE_OZONE) |
+#include "content/browser/gpu/browser_native_pixmap_manager_ozone.h" |
+#endif |
+ |
#if defined(OS_WIN) |
#include <windows.h> |
#include <commctrl.h> |
@@ -613,6 +617,12 @@ void BrowserMainLoop::PostMainMessageLoopStart() { |
} |
#endif |
+#if defined(USE_OZONE) |
+ DCHECK(!ui::NativePixmapManager::GetInstance()); |
+ ui::NativePixmapManager::SetInstance( |
+ BrowserNativePixmapManager::GetInstance()); |
+#endif |
+ |
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { |
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); |
memory_observer_.reset(new MemoryObserver()); |