Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: content/browser/browser_main_loop.cc

Issue 1513053002: WIP - Gutterless resize on Windows Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..708d36f4ca70c5962666670cd8a9de281c5a3a90 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(OS_WIN)
// 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.

Powered by Google App Engine
This is Rietveld 408576698