Index: trunk/src/content/renderer/mojo/mojo_render_process_observer.h |
=================================================================== |
--- trunk/src/content/renderer/mojo/mojo_render_process_observer.h (revision 258768) |
+++ trunk/src/content/renderer/mojo/mojo_render_process_observer.h (working copy) |
@@ -6,10 +6,8 @@ |
#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{ |
@@ -25,9 +23,7 @@ |
// 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, |
- public RenderProcessMojo { |
+class MojoRenderProcessObserver : public content::RenderProcessObserver { |
public: |
MojoRenderProcessObserver(RenderThread* render_thread); |
@@ -40,17 +36,10 @@ |
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); |
}; |