| Index: content/renderer/mojo/mojo_render_process_observer.h
|
| diff --git a/content/renderer/mojo/mojo_render_process_observer.h b/content/renderer/mojo/mojo_render_process_observer.h
|
| index 95f1b7053d373f9c32509aa2974a8a06e9777d07..c3649c51c2a733c3c54302bc104a06979e62d3cc 100644
|
| --- a/content/renderer/mojo/mojo_render_process_observer.h
|
| +++ b/content/renderer/mojo/mojo_render_process_observer.h
|
| @@ -6,8 +6,10 @@
|
| #define CONTENT_RENDERER_MOJO_MOJO_RENDER_PROCESS_OBSERVER_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/common/mojo/render_process.mojom.h"
|
| #include "content/public/renderer/render_process_observer.h"
|
| #include "ipc/ipc_platform_file.h"
|
| +#include "mojo/public/bindings/remote_ptr.h"
|
|
|
| namespace mojo {
|
| namespace embedder{
|
| @@ -23,7 +25,9 @@ class RenderThread;
|
| // RenderProcessObserver implementation that initializes the mojo channel when
|
| // the right IPC is seen.
|
| // MojoRenderProcessObserver deletes itself when the RenderProcess is shutdown.
|
| -class MojoRenderProcessObserver : public content::RenderProcessObserver {
|
| +class MojoRenderProcessObserver
|
| + : public content::RenderProcessObserver,
|
| + public RenderProcessMojo {
|
| public:
|
| MojoRenderProcessObserver(RenderThread* render_thread);
|
|
|
| @@ -36,10 +40,17 @@ class MojoRenderProcessObserver : public content::RenderProcessObserver {
|
|
|
| void OnChannelCreated(const IPC::PlatformFileForTransit& file);
|
|
|
| + // RenderProcessMojo overrides:
|
| + virtual void SetWebUIHandle(
|
| + int32 view_routing_id,
|
| + mojo::ScopedMessagePipeHandle web_ui_handle) OVERRIDE;
|
| +
|
| content::RenderThread* render_thread_;
|
|
|
| scoped_ptr<MojoChannelInit> channel_init_;
|
|
|
| + mojo::RemotePtr<content::RenderProcessHostMojo> render_process_host_mojo_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MojoRenderProcessObserver);
|
| };
|
|
|
|
|