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

Unified Diff: ash/host/ash_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 | « ash/host/ash_window_tree_host_ozone.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_win.cc
diff --git a/ash/host/ash_window_tree_host_win.cc b/ash/host/ash_window_tree_host_win.cc
index 30f98f633036de8a2acdc180dba16c652b129554..e91964518b7b016427d9e080d8fdf4ea02dde832 100644
--- a/ash/host/ash_window_tree_host_win.cc
+++ b/ash/host/ash_window_tree_host_win.cc
@@ -22,8 +22,9 @@ namespace {
class ASH_EXPORT AshWindowTreeHostWin : public AshWindowTreeHost,
public aura::WindowTreeHostWin {
public:
- explicit AshWindowTreeHostWin(const gfx::Rect& initial_bounds)
- : aura::WindowTreeHostWin(initial_bounds),
+ AshWindowTreeHostWin(const gfx::Rect& initial_bounds,
+ ui::ContextFactory* context_factory)
+ : aura::WindowTreeHostWin(initial_bounds, context_factory),
fullscreen_(false),
saved_window_style_(0),
saved_window_ex_style_(0),
@@ -116,9 +117,11 @@ AshWindowTreeHost* AshWindowTreeHost::Create(
if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
!CommandLine::ForCurrentProcess()->HasSwitch(
ash::switches::kForceAshToDesktop))
- return new AshRemoteWindowTreeHostWin(init_params.remote_hwnd);
+ return new AshRemoteWindowTreeHostWin(init_params.remote_hwnd,
+ init_params.context_factory);
- return new AshWindowTreeHostWin(init_params.initial_bounds);
+ return new AshWindowTreeHostWin(init_params.initial_bounds,
+ init_params.context_factory);
}
} // namespace ash
« no previous file with comments | « ash/host/ash_window_tree_host_ozone.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698