| Index: content/browser/devtools/devtools_agent_host_impl.cc
|
| diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
|
| index 96a24eaccbd822d8362860a9c8d4e0fd80d5b025..28764ba6b77def868355714c02ab9ec11b8699e1 100644
|
| --- a/content/browser/devtools/devtools_agent_host_impl.cc
|
| +++ b/content/browser/devtools/devtools_agent_host_impl.cc
|
| @@ -70,8 +70,9 @@ DevToolsAgentHost::List DevToolsAgentHost::GetOrCreateAll() {
|
|
|
| // static
|
| void DevToolsAgentHost::DiscoverAllHosts(const DiscoveryCallback& callback) {
|
| - DevToolsManager* manager = DevToolsManager::GetInstance();
|
| - if (!manager->delegate() || !manager->delegate()->DiscoverTargets(callback))
|
| + DevToolsManagerDelegate* manager_delegate =
|
| + DevToolsManager::GetInstance()->GetDelegate();
|
| + if (!manager_delegate || !manager_delegate->DiscoverTargets(callback))
|
| callback.Run(DevToolsAgentHost::GetOrCreateAll());
|
| }
|
|
|
| @@ -224,9 +225,10 @@ void DevToolsAgentHostImpl::ConnectWebContents(WebContents* wc) {
|
| }
|
|
|
| bool DevToolsAgentHostImpl::Inspect() {
|
| - DevToolsManager* manager = DevToolsManager::GetInstance();
|
| - if (manager->delegate()) {
|
| - manager->delegate()->Inspect(this);
|
| + DevToolsManagerDelegate* manager_delegate =
|
| + DevToolsManager::GetInstance()->GetDelegate();
|
| + if (manager_delegate) {
|
| + manager_delegate->Inspect(this);
|
| return true;
|
| }
|
| return false;
|
| @@ -312,8 +314,8 @@ void DevToolsAgentHostImpl::NotifyCallbacks(
|
| AgentStateCallbacks copy(g_callbacks.Get());
|
| DevToolsManager* manager = DevToolsManager::GetInstance();
|
| manager->AgentHostStateChanged(agent_host, attached);
|
| - if (manager->delegate())
|
| - manager->delegate()->DevToolsAgentStateChanged(agent_host, attached);
|
| + if (manager->GetDelegate())
|
| + manager->GetDelegate()->DevToolsAgentStateChanged(agent_host, attached);
|
| for (AgentStateCallbacks::iterator it = copy.begin(); it != copy.end(); ++it)
|
| (*it)->Run(agent_host, attached);
|
| }
|
|
|