| 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
|
|
|