Reland of [DevTools] Show icon in top toolbar when Node target is available

content/browser/devtools/protocol/target_handler.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/protocol/target_handler.h"
 
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/devtools_session.h"
 #include "content/browser/devtools/service_worker_devtools_agent_host.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 205 matching lines @@
     DevToolsAgentHost* host) {
   auto it = reported_hosts_.find(host->GetId());
   if (it == reported_hosts_.end())
     return;
   frontend_->TargetDestroyed(host->GetId());
   reported_hosts_.erase(it);
 }
 
 bool TargetHandler::AttachToTargetInternal(
     DevToolsAgentHost* host, bool waiting_for_debugger) {
-  if (!host->AttachClient(this))
+  attached_hosts_[host->GetId()] = host;
+  if (!host->AttachClient(this)) {
+    attached_hosts_.erase(host->GetId());
     return false;
-  attached_hosts_[host->GetId()] = host;
+  }
   frontend_->AttachedToTarget(CreateInfo(host), waiting_for_debugger);
   return true;
 }
 
 void TargetHandler::DetachFromTargetInternal(DevToolsAgentHost* host) {
   auto it = attached_hosts_.find(host->GetId());
   if (it == attached_hosts_.end())
     return;
   host->DetachClient(this);
   frontend_->DetachedFromTarget(host->GetId());
@@ skipping 169 matching lines @@
   attached_hosts_.erase(host->GetId());
 }
 
 // -------------- DevToolsAgentHostObserver -----------------
 
 bool TargetHandler::ShouldForceDevToolsAgentHostCreation() {
   return true;
 }
 
 void TargetHandler::DevToolsAgentHostCreated(DevToolsAgentHost* agent_host) {
+  if (agent_host->GetType() == "node" && agent_host->IsAttached())
+    return;
   // If we start discovering late, all existing agent hosts will be reported,
   // but we could have already attached to some.
   TargetCreatedInternal(agent_host);
 }
 
 void TargetHandler::DevToolsAgentHostDestroyed(DevToolsAgentHost* agent_host) {
   DCHECK(attached_hosts_.find(agent_host->GetId()) == attached_hosts_.end());
   TargetDestroyedInternal(agent_host);
 }
 
+void TargetHandler::DevToolsAgentHostAttached(DevToolsAgentHost* host) {
+  if (host->GetType() == "node" &&
+      reported_hosts_.find(host->GetId()) != reported_hosts_.end() &&
+      attached_hosts_.find(host->GetId()) == attached_hosts_.end()) {
+    TargetDestroyedInternal(host);
+  }
+}
+
+void TargetHandler::DevToolsAgentHostDetached(DevToolsAgentHost* host) {
+  if (host->GetType() == "node" &&
+      reported_hosts_.find(host->GetId()) == reported_hosts_.end() &&
+      attached_hosts_.find(host->GetId()) == attached_hosts_.end()) {
+    TargetCreatedInternal(host);
+  }
+}
+
 // -------- ServiceWorkerDevToolsManager::Observer ----------
 
 void TargetHandler::WorkerCreated(
     ServiceWorkerDevToolsAgentHost* host) {
   BrowserContext* browser_context = nullptr;
   if (render_frame_host_)
     browser_context = render_frame_host_->GetProcess()->GetBrowserContext();
   auto hosts = GetMatchingServiceWorkers(browser_context, frame_urls_);
   if (hosts.find(host->GetId()) != hosts.end() && !host->IsAttached() &&
       !host->IsPausedForDebugOnStart() && wait_for_debugger_on_start_) {
@@ skipping 23 matching lines @@
   UpdateServiceWorkers();
 }
 
 void TargetHandler::WorkerDestroyed(
     ServiceWorkerDevToolsAgentHost* host) {
   UpdateServiceWorkers();
 }
 
 }  // namespace protocol
 }  // namespace content