Extract debugger target enumeration into a separate class

content/browser/devtools/render_view_devtools_agent_host.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/browser/devtools/render_view_devtools_agent_host.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
+#include "base/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/renderer_overrides_handler.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/favicon_status.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "net/base/escape.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/snapshot/snapshot.h"
 
 
 namespace content {
 
 typedef std::vector<RenderViewDevToolsAgentHost*> Instances;
 
@@ skipping 64 matching lines @@
     RenderViewHost* rvh = (*it)->render_view_host_;
     if (rvh && rvh->GetDelegate() != delegate)
       continue;
     if (devtools_manager->GetDevToolsClientHostFor(*it))
       return true;
   }
   return false;
 }
 
 // static
-int DevToolsAgentHost::DisconnectRenderViewHost(RenderViewHost* rvh) {
+const std::string DevToolsAgentHost::NullId;
+
+// static
+std::string DevToolsAgentHost::DisconnectRenderViewHost(RenderViewHost* rvh) {
   RenderViewDevToolsAgentHost* agent_host = FindAgentHost(rvh);
   if (!agent_host)
-    return -1;
+    return NullId;
   agent_host->DisconnectRenderViewHost();
-  return agent_host->id();
+  return agent_host->GetId();
 }
 
 // static
-void DevToolsAgentHost::ConnectRenderViewHost(int cookie,
+void DevToolsAgentHost::ConnectRenderViewHost(const std::string& cookie,
                                               RenderViewHost* rvh) {
   for (Instances::iterator it = g_instances.Get().begin();
        it != g_instances.Get().end(); ++it) {
-    if (cookie == (*it)->id()) {
+    if (cookie == (*it)->GetId()) {
       (*it)->ConnectRenderViewHost(rvh, true);
       break;
     }
   }
 }
 
 // static
 void RenderViewDevToolsAgentHost::OnCancelPendingNavigation(
     RenderViewHost* pending,
     RenderViewHost* current) {
-  int cookie = DevToolsAgentHost::DisconnectRenderViewHost(pending);
-  if (cookie != -1)
+  std::string cookie = DevToolsAgentHost::DisconnectRenderViewHost(pending);
+  if (cookie != NullId)
     DevToolsAgentHost::ConnectRenderViewHost(cookie, current);
 }
 
 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(
     RenderViewHost* rvh)
     : overrides_handler_(new RendererOverridesHandler(this)) {
   ConnectRenderViewHost(rvh, false);
   g_instances.Get().push_back(this);
   RenderViewHostDelegate* delegate = render_view_host_->GetDelegate();
   if (delegate && delegate->GetAsWebContents())
     Observe(delegate->GetAsWebContents());
 }
 
 RenderViewHost* RenderViewDevToolsAgentHost::GetRenderViewHost() {
   return render_view_host_;
 }
 
+std::string RenderViewDevToolsAgentHost::GetTitle() {
+  if (!render_view_host_)
+    return "";
+
+  WebContents* web_contents =
+      render_view_host_->GetDelegate()->GetAsWebContents();
+  if (!web_contents)
+    return "";
+
+  return UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle()));
+}
+
+GURL RenderViewDevToolsAgentHost::GetUrl() {
+  if (!render_view_host_)
+    return GURL();
+
+   return render_view_host_->GetDelegate()->GetURL();
+}
+
+GURL RenderViewDevToolsAgentHost::GetFaviconUrl() {
+  if (!render_view_host_)
+    return GURL();
+
+  WebContents* web_contents =
+      render_view_host_->GetDelegate()->GetAsWebContents();
+  if (!web_contents)
+    return GURL();
+
+  NavigationController& controller = web_contents->GetController();
+  NavigationEntry* entry = controller.GetActiveEntry();
+  if (!entry || !entry->GetURL().is_valid())
+    return GURL();
+
+  return entry->GetFavicon().url;
+}
+
 void RenderViewDevToolsAgentHost::DispatchOnInspectorBackend(
     const std::string& message) {
   std::string error_message;
   scoped_ptr<DevToolsProtocol::Command> command(
       DevToolsProtocol::ParseCommand(message, &error_message));
   if (!command) {
     OnDispatchOnInspectorFrontend(error_message);
     return;
   }
 
@@ skipping 180 matching lines @@
                             snapshot_bounds))
     return false;
 
   return base::Base64Encode(base::StringPiece(
                                 reinterpret_cast<char*>(&*png.begin()),
                                 png.size()),
                             base_64_data);
 }
 
 }  // namespace content