| Index: content/browser/debugger/devtools_manager.h
|
| diff --git a/content/browser/debugger/devtools_manager.h b/content/browser/debugger/devtools_manager.h
|
| index 1801d0c1eb5638bd7772d52b6a4a1a33ec1caf3f..098aead2e16ef777d0592bc569df384b9b5908e4 100644
|
| --- a/content/browser/debugger/devtools_manager.h
|
| +++ b/content/browser/debugger/devtools_manager.h
|
| @@ -13,6 +13,7 @@
|
| #include "content/browser/debugger/devtools_agent_host.h"
|
| #include "content/browser/debugger/devtools_client_host.h"
|
| #include "content/common/content_export.h"
|
| +#include "content/public/browser/devtools/devtools_manager.h"
|
|
|
| class DevToolsAgentHost;
|
| class GURL;
|
| @@ -31,7 +32,8 @@ class Message;
|
| // DevToolAgentHost.
|
| class CONTENT_EXPORT DevToolsManager
|
| : public DevToolsClientHost::CloseListener,
|
| - public DevToolsAgentHost::CloseListener {
|
| + public DevToolsAgentHost::CloseListener,
|
| + public content::DevToolsManager {
|
| public:
|
| static DevToolsManager* GetInstance();
|
|
|
| @@ -44,12 +46,10 @@ class CONTENT_EXPORT DevToolsManager
|
|
|
| // Registers new DevToolsClientHost for |inspected_rvh|. There must be no
|
| // other DevToolsClientHosts registered for the RenderViewHost at the moment.
|
| - void RegisterDevToolsClientHostFor(RenderViewHost* inspected_rvh,
|
| - DevToolsClientHost* client_host);
|
| void UnregisterDevToolsClientHostFor(RenderViewHost* inspected_rvh);
|
|
|
| - bool ForwardToDevToolsAgent(DevToolsClientHost* from,
|
| - const IPC::Message& message);
|
| + virtual bool ForwardToDevToolsAgent(DevToolsClientHost* from,
|
| + const IPC::Message& message) OVERRIDE;
|
| void ForwardToDevToolsClient(DevToolsAgentHost* agent_host,
|
| const IPC::Message& message);
|
|
|
| @@ -66,7 +66,7 @@ class CONTENT_EXPORT DevToolsManager
|
|
|
| // Invoked when a tab is replaced by another tab. This is triggered by
|
| // TabStripModel::ReplaceTabContentsAt.
|
| - void TabReplaced(TabContents* old_tab, TabContents* new_tab);
|
| + virtual void TabReplaced(TabContents* old_tab, TabContents* new_tab) OVERRIDE;
|
|
|
| // Detaches client host and returns cookie that can be used in
|
| // AttachClientHost.
|
| @@ -77,15 +77,18 @@ class CONTENT_EXPORT DevToolsManager
|
| RenderViewHost* to_rvh);
|
|
|
| // Closes all open developer tools windows.
|
| - void CloseAllClientHosts();
|
| -
|
| - void AttachClientHost(int client_host_cookie,
|
| - DevToolsAgentHost* to_agent);
|
| - DevToolsClientHost* GetDevToolsClientHostFor(DevToolsAgentHost* agent_host);
|
| - void RegisterDevToolsClientHostFor(DevToolsAgentHost* agent_host,
|
| - DevToolsClientHost* client_host);
|
| - void UnregisterDevToolsClientHostFor(DevToolsAgentHost* agent_host);
|
| - int DetachClientHost(DevToolsAgentHost* from_agent);
|
| + virtual void CloseAllClientHosts() OVERRIDE;
|
| +
|
| + virtual void AttachClientHost(int client_host_cookie,
|
| + DevToolsAgentHost* to_agent) OVERRIDE;
|
| + virtual DevToolsClientHost* GetDevToolsClientHostFor(
|
| + DevToolsAgentHost* agent_host) OVERRIDE;
|
| + virtual void RegisterDevToolsClientHostFor(
|
| + DevToolsAgentHost* agent_host,
|
| + DevToolsClientHost* client_host) OVERRIDE;
|
| + virtual void UnregisterDevToolsClientHostFor(
|
| + DevToolsAgentHost* agent_host) OVERRIDE;
|
| + virtual int DetachClientHost(DevToolsAgentHost* from_agent) OVERRIDE;
|
|
|
| private:
|
| // DevToolsClientHost::CloseListener override.
|
|
|