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

Unified Diff: ui/aura/window_tree_host_win.cc

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 months 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
« no previous file with comments | « ui/aura/window_tree_host_win.h ('k') | ui/aura/window_tree_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host_win.cc
diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc
index adf56e91ac76e7092f40d754d9278d016efe6a82..120167b3f6445270550b536559e66934b6f1fe29 100644
--- a/ui/aura/window_tree_host_win.cc
+++ b/ui/aura/window_tree_host_win.cc
@@ -30,8 +30,9 @@ bool use_popup_as_root_window_for_test = false;
} // namespace
// static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
- return new WindowTreeHostWin(bounds);
+WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
+ return new WindowTreeHostWin(bounds, context_factory);
}
// static
@@ -40,13 +41,14 @@ gfx::Size WindowTreeHost::GetNativeScreenSize() {
GetSystemMetrics(SM_CYSCREEN));
}
-WindowTreeHostWin::WindowTreeHostWin(const gfx::Rect& bounds)
+WindowTreeHostWin::WindowTreeHostWin(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory)
: has_capture_(false) {
if (use_popup_as_root_window_for_test)
set_window_style(WS_POPUP);
Init(NULL, bounds);
SetWindowText(hwnd(), L"aura::RootWindow!");
- CreateCompositor(GetAcceleratedWidget());
+ CreateCompositor(GetAcceleratedWidget(), context_factory);
}
WindowTreeHostWin::~WindowTreeHostWin() {
« no previous file with comments | « ui/aura/window_tree_host_win.h ('k') | ui/aura/window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698