| Index: chrome/browser/devtools/chrome_devtools_manager_delegate.h
|
| diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.h b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
|
| index 567fcb5ee323a81e3cff9d3d0b04b2911d4a861a..8292d8b8def902ddf5bf6de1583b324a75d59d65 100644
|
| --- a/chrome/browser/devtools/chrome_devtools_manager_delegate.h
|
| +++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
|
| @@ -11,12 +11,15 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "chrome/browser/devtools/device/devtools_android_bridge.h"
|
| +#include "content/public/browser/devtools_agent_host_observer.h"
|
| #include "content/public/browser/devtools_manager_delegate.h"
|
| #include "net/base/host_port_pair.h"
|
|
|
| class DevToolsNetworkProtocolHandler;
|
|
|
| -class ChromeDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
|
| +class ChromeDevToolsManagerDelegate :
|
| + public content::DevToolsManagerDelegate,
|
| + public content::DevToolsAgentHostObserver {
|
| public:
|
| static char kTypeApp[];
|
| static char kTypeBackgroundPage[];
|
| @@ -25,10 +28,9 @@ class ChromeDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
|
| ChromeDevToolsManagerDelegate();
|
| ~ChromeDevToolsManagerDelegate() override;
|
|
|
| + private:
|
| // content::DevToolsManagerDelegate implementation.
|
| void Inspect(content::DevToolsAgentHost* agent_host) override;
|
| - void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host,
|
| - bool attached) override;
|
| bool DiscoverTargets(
|
| const content::DevToolsAgentHost::DiscoveryCallback& callback) override;
|
| base::DictionaryValue* HandleCommand(
|
| @@ -41,7 +43,12 @@ class ChromeDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
|
| std::string GetDiscoveryPageHTML() override;
|
| std::string GetFrontendResource(const std::string& path) override;
|
|
|
| - private:
|
| + // content::DevToolsAgentHostObserver overrides.
|
| + void DevToolsAgentHostAttached(
|
| + content::DevToolsAgentHost* agent_host) override;
|
| + void DevToolsAgentHostDetached(
|
| + content::DevToolsAgentHost* agent_host) override;
|
| +
|
| void DevicesAvailable(
|
| const content::DevToolsAgentHost::DiscoveryCallback& callback,
|
| const DevToolsAndroidBridge::CompleteDevices& devices);
|
|
|