Chromium Code Reviews| Index: content/app/content_main_runner.cc |
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc |
| index 2906e77f0d2d805215b63bd2a352c525cf788f65..c4a6d1cfd107f1e5cf70df946cad36908d40e118 100644 |
| --- a/content/app/content_main_runner.cc |
| +++ b/content/app/content_main_runner.cc |
| @@ -110,6 +110,10 @@ |
| #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); |
| @@ -683,6 +687,14 @@ class ContentMainRunnerImpl : public ContentMainRunner { |
| SetupCRT(command_line); |
| #endif |
| +#if defined(USE_OZONE) |
| + if (!ui::NativePixmapManager::GetInstance() && |
|
reveman
2015/07/23 18:25:23
why the GetInstance check?
dshwang
2015/07/24 12:19:00
I assumed that this routine can be called several
|
| + process_type == switches::kRendererProcess) { |
| + ui::NativePixmapManager::SetInstance( |
| + ui::NativePixmapManager::Create().release()); |
|
reveman
2015/07/23 18:25:23
Please don't leak the manager. At least use a base
dshwang
2015/07/24 12:19:00
Done. use member.
|
| + } |
| +#endif |
| + |
| #if defined(OS_POSIX) |
| if (!process_type.empty()) { |
| // When you hit Ctrl-C in a terminal running the browser |