| Index: mojo/examples/aura_demo/root_window_host_mojo.h
|
| diff --git a/mojo/examples/aura_demo/root_window_host_mojo.h b/mojo/examples/aura_demo/root_window_host_mojo.h
|
| index 3391ce3758782a964230645dfd7a06988a13901d..3e35988935d8120a0c621c8d6bf82bc84d7924b0 100644
|
| --- a/mojo/examples/aura_demo/root_window_host_mojo.h
|
| +++ b/mojo/examples/aura_demo/root_window_host_mojo.h
|
| @@ -19,17 +19,17 @@ namespace examples {
|
|
|
| class GLES2ClientImpl;
|
|
|
| -class RootWindowHostMojo : public aura::RootWindowHost,
|
| +class WindowTreeHostMojo : public aura::WindowTreeHost,
|
| public NativeViewportClient {
|
| public:
|
| - RootWindowHostMojo(ScopedMessagePipeHandle viewport_handle,
|
| + WindowTreeHostMojo(ScopedMessagePipeHandle viewport_handle,
|
| const base::Callback<void()>& compositor_created_callback);
|
| - virtual ~RootWindowHostMojo();
|
| + virtual ~WindowTreeHostMojo();
|
|
|
| GLES2ClientImpl* gles2_client() { return gles2_client_.get(); }
|
|
|
| private:
|
| - // RootWindowHost:
|
| + // WindowTreeHost:
|
| virtual aura::RootWindow* GetRootWindow() OVERRIDE;
|
| virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
|
| virtual void Show() OVERRIDE;
|
| @@ -65,7 +65,7 @@ class RootWindowHostMojo : public aura::RootWindowHost,
|
| RemotePtr<NativeViewport> native_viewport_;
|
| base::Callback<void()> compositor_created_callback_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RootWindowHostMojo);
|
| + DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo);
|
| };
|
|
|
| } // namespace examples
|
|
|