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..69a7cce4ed609681d467aece191debc0396f8fca 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 "ui/ozone/public/native_pixmap_manager.h" |
+#endif |
+ |
#if defined(OS_WIN) |
#include <windows.h> |
#include <commctrl.h> |
@@ -613,6 +617,11 @@ void BrowserMainLoop::PostMainMessageLoopStart() { |
} |
#endif |
+#if defined(USE_OZONE) |
+ DCHECK(!ui::NativePixmapManager::GetInstance()); |
reveman
2015/07/23 14:46:12
nit: remove DCHECK. handled by SetInstance already
dshwang
2015/07/23 16:42:09
Done.
|
+ ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create()); |
+#endif |
+ |
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { |
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); |
memory_observer_.reset(new MemoryObserver()); |