| Index: mojo/examples/aura_demo/aura_demo.cc
|
| diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
|
| index 2ac77cd5dc350918db84703c94160958d3dc8d57..24f0a75387254cc8101d21fcfe8da7ba0b76f096 100644
|
| --- a/mojo/examples/aura_demo/aura_demo.cc
|
| +++ b/mojo/examples/aura_demo/aura_demo.cc
|
| @@ -125,7 +125,7 @@ class AuraDemo : public ShellClient {
|
|
|
| mojo::ScopedMessagePipeHandle client_handle, native_viewport_handle;
|
| CreateMessagePipe(&client_handle, &native_viewport_handle);
|
| - root_window_host_.reset(new RootWindowHostMojo(
|
| + root_window_host_.reset(new WindowTreeHostMojo(
|
| native_viewport_handle.Pass(),
|
| base::Bind(&AuraDemo::HostContextCreated, base::Unretained(this))));
|
| mojo::AllocationScope scope;
|
| @@ -183,7 +183,7 @@ class AuraDemo : public ShellClient {
|
| aura::Window* window21_;
|
|
|
| mojo::RemotePtr<Shell> shell_;
|
| - scoped_ptr<RootWindowHostMojo> root_window_host_;
|
| + scoped_ptr<WindowTreeHostMojo> root_window_host_;
|
| scoped_ptr<aura::RootWindow> root_window_;
|
| };
|
|
|
|
|