Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2098)

Unified Diff: content/browser/devtools/devtools_agent_host_impl.cc

Issue 2408133004: [DevTools] Implement Target.setDiscoverTargets method. (Closed)
Patch Set: new fancy range-based iteration in observer list! Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « no previous file | content/browser/devtools/devtools_manager.h » ('j') | content/browser/devtools/devtools_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698