Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
diff --git a/mojo/aura/window_tree_host_mojo.cc b/mojo/aura/window_tree_host_mojo.cc
index b623bbd..9aba1d8 100644
--- a/mojo/aura/window_tree_host_mojo.cc
+++ b/mojo/aura/window_tree_host_mojo.cc
@@ -26,12 +26,14 @@
// WindowTreeHostMojo, public:
WindowTreeHostMojo::WindowTreeHostMojo(
- ScopedNativeViewportHandle viewport_handle,
+ NativeViewportPtr viewport,
const gfx::Rect& bounds,
const base::Callback<void()>& compositor_created_callback)
- : native_viewport_(viewport_handle.Pass(), this),
+ : native_viewport_(viewport.Pass()),
compositor_created_callback_(compositor_created_callback),
bounds_(bounds) {
+ native_viewport_->SetClient(this);
+
AllocationScope scope;
native_viewport_->Create(bounds);