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

Unified Diff: ui/aura/remote_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/remote_window_tree_host_win.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/remote_window_tree_host_win.cc
diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc
index 2dbc0e7a91c7608e8765e151ec6c1770427f8e46..a47cde79b0b2e8783b627aff21f943a2aba55d99 100644
--- a/ui/aura/remote_window_tree_host_win.cc
+++ b/ui/aura/remote_window_tree_host_win.cc
@@ -154,7 +154,8 @@ RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
return g_instance;
}
-RemoteWindowTreeHostWin::RemoteWindowTreeHostWin()
+RemoteWindowTreeHostWin::RemoteWindowTreeHostWin(
+ ui::ContextFactory* context_factory)
: remote_window_(NULL),
host_(NULL),
ignore_mouse_moves_until_set_cursor_ack_(false),
@@ -163,7 +164,7 @@ RemoteWindowTreeHostWin::RemoteWindowTreeHostWin()
CHECK(!g_instance);
g_instance = this;
prop_.reset(new ui::ViewProp(NULL, kWindowTreeHostWinKey, this));
- CreateCompositor(GetAcceleratedWidget());
+ CreateCompositor(GetAcceleratedWidget(), context_factory);
}
RemoteWindowTreeHostWin::~RemoteWindowTreeHostWin() {
@@ -188,7 +189,7 @@ void RemoteWindowTreeHostWin::Connected(IPC::Sender* host) {
host_ = host;
// Recreate the compositor for the target surface represented by the
// remote_window HWND.
- CreateCompositor(remote_window_);
+ CreateCompositor(remote_window_, compositor()->context_factory());
InitCompositor();
}
« no previous file with comments | « ui/aura/remote_window_tree_host_win.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698