Chromium Code Reviews| Index: content/browser/browser_main_loop.cc |
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
| index edc53926501890387fdd02481b3db2dfde58a0cd..8af94825024a12c26360a9cc64cf32ff41fd38ec 100644 |
| --- a/content/browser/browser_main_loop.cc |
| +++ b/content/browser/browser_main_loop.cc |
| @@ -112,7 +112,10 @@ |
| #include "content/browser/compositor/browser_compositor_view_mac.h" |
| #include "content/browser/in_process_io_surface_manager_mac.h" |
| #include "content/browser/theme_helper_mac.h" |
| -#include "ui/accelerated_widget_mac/window_resize_helper_mac.h" |
| +#endif |
| + |
| +#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) |
| +#include "ui/base/window_resize_helper.h" |
| #endif |
| #if defined(USE_OZONE) |
| @@ -748,11 +751,11 @@ int BrowserMainLoop::PreCreateThreads() { |
| } |
| #endif |
| -#if defined(OS_MACOSX) && !defined(OS_IOS) |
| +#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(USE_AURA) |
|
ericrk
2015/12/10 23:08:43
should be OS_WIN not USE_AURA, will adjust in next
|
| // The WindowResizeHelper allows the UI thread to wait on specific renderer |
| // and GPU messages from the IO thread. Initializing it before the IO thread |
| // starts ensures the affected IO thread messages always have somewhere to go. |
| - ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get()); |
| + ui::WindowResizeHelper::Get()->Init(base::ThreadTaskRunnerHandle::Get()); |
| #endif |
| // 1) Need to initialize in-process GpuDataManager before creating threads. |