| Index: content/browser/devtools/render_view_devtools_agent_host.h
|
| diff --git a/content/browser/devtools/render_view_devtools_agent_host.h b/content/browser/devtools/render_view_devtools_agent_host.h
|
| index 93fca3d8f24441345ee8457a553917ec8c8da839..044da113d37c01c6301e0d92a402dd278facdb2f 100644
|
| --- a/content/browser/devtools/render_view_devtools_agent_host.h
|
| +++ b/content/browser/devtools/render_view_devtools_agent_host.h
|
| @@ -39,9 +39,6 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
|
| static void OnCancelPendingNavigation(RenderViewHost* pending,
|
| RenderViewHost* current);
|
|
|
| - static bool DispatchIPCMessage(RenderViewHost* source,
|
| - const IPC::Message& message);
|
| -
|
| RenderViewDevToolsAgentHost(RenderViewHost*);
|
|
|
| RenderViewHost* render_view_host() { return render_view_host_; }
|
| @@ -55,9 +52,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
|
| virtual ~RenderViewDevToolsAgentHost();
|
|
|
| // DevTooolsAgentHost overrides.
|
| - virtual void DisconnectRenderViewHost() OVERRIDE;
|
| - virtual void ConnectRenderViewHost(RenderViewHost* rvh) OVERRIDE;
|
| - virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
|
| + virtual void DisconnectWebContents() OVERRIDE;
|
| + virtual void ConnectWebContents(WebContents* web_contents) OVERRIDE;
|
| + virtual WebContents* GetWebContents() OVERRIDE;
|
|
|
| // IPCDevToolsAgentHost overrides.
|
| virtual void DispatchOnInspectorBackend(const std::string& message) OVERRIDE;
|
| @@ -71,6 +68,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
|
| RenderViewHost* new_host) OVERRIDE;
|
| virtual void RenderViewDeleted(RenderViewHost* rvh) OVERRIDE;
|
| virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
|
| + virtual bool OnMessageReceived(const IPC::Message& message,
|
| + RenderFrameHost* render_frame_host) OVERRIDE;
|
| + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| virtual void DidAttachInterstitialPage() OVERRIDE;
|
|
|
| // NotificationObserver overrides:
|
| @@ -78,6 +78,8 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
|
| const NotificationSource& source,
|
| const NotificationDetails& details) OVERRIDE;
|
|
|
| + void DisconnectRenderViewHost();
|
| + void ConnectRenderViewHost(RenderViewHost* rvh);
|
| void ReattachToRenderViewHost(RenderViewHost* rvh);
|
|
|
| bool DispatchIPCMessage(const IPC::Message& message);
|
|
|