DevTools: pass agent host id to the renderer (content).

content/renderer/devtools/devtools_agent.cc

 // Copyright (c) 2012 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/renderer/devtools/devtools_agent.h"
 
 #include <map>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 107 matching lines @@
 void DevToolsAgent::sendMessageToInspectorFrontend(
     const blink::WebString& message) {
   Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(routing_id(),
                                                          message.utf8()));
 }
 
 int DevToolsAgent::hostIdentifier() {
   return routing_id();
 }
 
+int DevToolsAgent::debuggerId() {
+  return routing_id();
+}
+
 void DevToolsAgent::saveAgentRuntimeState(
     const blink::WebString& state) {
   Send(new DevToolsHostMsg_SaveAgentRuntimeState(routing_id(), state.utf8()));
 }
 
 blink::WebDevToolsAgentClient::WebKitClientMessageLoop*
     DevToolsAgent::createClientMessageLoop() {
   return new WebKitClientMessageLoopImpl();
 }
 
@@ skipping 128 matching lines @@
 }
 #endif
 
 void DevToolsAgent::visitAllocatedObjects(AllocatedObjectVisitor* visitor) {
 #if defined(USE_TCMALLOC) && !defined(OS_WIN)
   IterateAllocatedObjects(&AllocationVisitor, visitor);
 #endif
 }
 
 // static
-DevToolsAgent* DevToolsAgent::FromHostId(int host_id) {
-  IdToAgentMap::iterator it = g_agent_for_routing_id.Get().find(host_id);
+DevToolsAgent* DevToolsAgent::FromRoutingId(int routing_id) {
+  IdToAgentMap::iterator it = g_agent_for_routing_id.Get().find(routing_id);
   if (it != g_agent_for_routing_id.Get().end()) {
     return it->second;
   }
   return NULL;
 }
 
-void DevToolsAgent::OnAttach() {
+void DevToolsAgent::OnAttach(const std::string& host_id) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
-    web_agent->attach();
+    web_agent->attach(WebString::fromUTF8(host_id));
     is_attached_ = true;
   }
 }
 
-void DevToolsAgent::OnReattach(const std::string& agent_state) {
+void DevToolsAgent::OnReattach(const std::string& host_id,
+                               const std::string& agent_state) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
-    web_agent->reattach(WebString::fromUTF8(agent_state));
+    web_agent->reattach(WebString::fromUTF8(host_id),
+                        WebString::fromUTF8(agent_state));
     is_attached_ = true;
   }
 }
 
 void DevToolsAgent::OnDetach() {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->detach();
     is_attached_ = false;
   }
 }
 
 void DevToolsAgent::OnDispatchOnInspectorBackend(const std::string& message) {
   TRACE_EVENT0("devtools", "DevToolsAgent::OnDispatchOnInspectorBackend");
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
     web_agent->dispatchOnInspectorBackend(WebString::fromUTF8(message));
 }
 
-void DevToolsAgent::OnInspectElement(int x, int y) {
+void DevToolsAgent::OnInspectElement(
+    const std::string& host_id, int x, int y) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
-    web_agent->attach();
+    web_agent->attach(WebString::fromUTF8(host_id));
     web_agent->inspectElementAt(WebPoint(x, y));
+    is_attached_ = true;
   }
 }
 
 void DevToolsAgent::OnAddMessageToConsole(ConsoleMessageLevel level,
                                           const std::string& message) {
   WebView* web_view = render_view()->GetWebView();
   if (!web_view)
     return;
 
   WebFrame* main_frame = web_view->mainFrame();
@@ skipping 40 matching lines @@
   if (!web_view)
     return NULL;
   return web_view->devToolsAgent();
 }
 
 bool DevToolsAgent::IsAttached() {
   return is_attached_;
 }
 
 }  // namespace content