| Index: content/browser/renderer_host/java/java_bridge_dispatcher_host.h
|
| ===================================================================
|
| --- content/browser/renderer_host/java/java_bridge_dispatcher_host.h (revision 164665)
|
| +++ content/browser/renderer_host/java/java_bridge_dispatcher_host.h (working copy)
|
| @@ -16,7 +16,6 @@
|
| class NPChannelBase;
|
| class RenderViewHost;
|
| struct NPVariant_Param;
|
| -}
|
|
|
| // This class handles injecting Java objects into a single RenderView. The Java
|
| // object itself lives in the browser process on a background thread, while a
|
| @@ -24,10 +23,10 @@
|
| // for each RenderViewHost.
|
| class JavaBridgeDispatcherHost
|
| : public base::RefCountedThreadSafe<JavaBridgeDispatcherHost>,
|
| - public content::RenderViewHostObserver {
|
| + public RenderViewHostObserver {
|
| public:
|
| // We hold a weak pointer to the RenderViewhost. It must outlive this object.
|
| - JavaBridgeDispatcherHost(content::RenderViewHost* render_view_host);
|
| + JavaBridgeDispatcherHost(RenderViewHost* render_view_host);
|
|
|
| // Injects |object| into the main frame of the corresponding RenderView. A
|
| // proxy object is created in the renderer and when the main frame's window
|
| @@ -45,7 +44,7 @@
|
| // The IPC macros require this to be public.
|
| virtual bool Send(IPC::Message* msg) OVERRIDE;
|
| virtual void RenderViewHostDestroyed(
|
| - content::RenderViewHost* render_view_host) OVERRIDE;
|
| + RenderViewHost* render_view_host) OVERRIDE;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<JavaBridgeDispatcherHost>;
|
| @@ -58,13 +57,15 @@
|
| void OnGetChannelHandle(IPC::Message* reply_msg);
|
|
|
| void GetChannelHandle(IPC::Message* reply_msg);
|
| - void CreateNPVariantParam(NPObject* object, content::NPVariant_Param* param);
|
| + void CreateNPVariantParam(NPObject* object, NPVariant_Param* param);
|
| void CreateObjectStub(NPObject* object, int route_id);
|
|
|
| - scoped_refptr<content::NPChannelBase> channel_;
|
| + scoped_refptr<NPChannelBase> channel_;
|
| bool is_renderer_initialized_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(JavaBridgeDispatcherHost);
|
| };
|
|
|
| +} // namespace content
|
| +
|
| #endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
|
|
|