Index: content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h |
=================================================================== |
--- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h (revision 164665) |
+++ content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h (working copy) |
@@ -12,19 +12,18 @@ |
#include "base/string16.h" |
#include "content/public/browser/web_contents_observer.h" |
-class JavaBridgeDispatcherHost; |
struct NPObject; |
namespace content { |
+class JavaBridgeDispatcherHost; |
class RenderViewHost; |
-} |
// This class handles injecting Java objects into all of the RenderViews |
// associated with a WebContents. It manages a set of JavaBridgeDispatcherHost |
// objects, one per RenderViewHost. |
-class JavaBridgeDispatcherHostManager : public content::WebContentsObserver { |
+class JavaBridgeDispatcherHostManager : public WebContentsObserver { |
public: |
- explicit JavaBridgeDispatcherHostManager(content::WebContents* web_contents); |
+ explicit JavaBridgeDispatcherHostManager(WebContents* web_contents); |
virtual ~JavaBridgeDispatcherHostManager(); |
// These methods add or remove the object to each JavaBridgeDispatcherHost. |
@@ -33,17 +32,13 @@ |
void AddNamedObject(const string16& name, NPObject* object); |
void RemoveNamedObject(const string16& name); |
- // content::WebContentsObserver overrides |
- virtual void RenderViewCreated( |
- content::RenderViewHost* render_view_host) OVERRIDE; |
- virtual void RenderViewDeleted( |
- content::RenderViewHost* render_view_host) OVERRIDE; |
- virtual void WebContentsDestroyed( |
- content::WebContents* web_contents) OVERRIDE; |
+ // WebContentsObserver overrides |
+ virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; |
+ virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE; |
+ virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; |
private: |
- typedef std::map<content::RenderViewHost*, |
- scoped_refptr<JavaBridgeDispatcherHost> > |
+ typedef std::map<RenderViewHost*, scoped_refptr<JavaBridgeDispatcherHost> > |
InstanceMap; |
InstanceMap instances_; |
typedef std::map<string16, NPObject*> ObjectMap; |
@@ -52,4 +47,6 @@ |
DISALLOW_COPY_AND_ASSIGN(JavaBridgeDispatcherHostManager); |
}; |
+} // namespace content |
+ |
#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_ |