Chromium Code Reviews| Index: chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
| diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
| index 3e683c86e3542360d577d67dbd08547eac4f8d35..8906a0655a12f0d99bb44cdd98d6e36c80580a45 100644 |
| --- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
| +++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
| @@ -6,6 +6,7 @@ |
| #include "build/build_config.h" |
| #include "chrome/browser/devtools/devtools_network_protocol_handler.h" |
| +#include "components/devtools_discovery/devtools_discovery_manager.h" |
| #if !defined(OS_ANDROID) |
| #include "chrome/browser/devtools/devtools_window.h" |
| @@ -13,6 +14,8 @@ |
| #include "content/public/browser/devtools_agent_host.h" |
| #endif // !defined(OS_ANDROID) |
| +using devtools_discovery::DevToolsDiscoveryManager; |
| + |
| ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() |
| : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { |
| } |
| @@ -44,6 +47,11 @@ void ChromeDevToolsManagerDelegate::Inspect( |
| base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand( |
| content::DevToolsAgentHost* agent_host, |
| base::DictionaryValue* command_dict) { |
| + std::unique_ptr<base::DictionaryValue> result = |
| + DevToolsDiscoveryManager::GetInstance()->MaybeHandleNewPageCommand( |
|
pfeldman
2016/07/06 17:38:09
It seems we are skipping the Maybe prefix in other
alex clarke (OOO till 29th)
2016/07/06 20:25:06
Done.
|
| + command_dict); |
| + if (result) |
| + return result.release(); // Caller takes ownership. |
| return network_protocol_handler_->HandleCommand(agent_host, command_dict); |
| } |