Show extension names instead of urls in DevTools http protocol target list

BUG=None


Review URL: https://chromiumcodereview.appspot.com/12579006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187852 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 3 deletions

diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index a9508c2..aca4bac 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -5,6 +5,9 @@
 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 
 #include "base/path_service.h"
+#include "chrome/browser/extensions/extension_host.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -109,6 +112,23 @@ BrowserListTabContentsProvider::GetTargetType(content::RenderViewHost* rvh) {
 }
 
 std::string BrowserListTabContentsProvider::GetViewDescription(
-    content::RenderViewHost*) {
-  return "";
+    content::RenderViewHost* rvh) {
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderViewHost(rvh);
+  if (!web_contents)
+    return "";
+
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  if (!profile)
+    return "";
+
+  extensions::ExtensionHost* extension_host =
+      extensions::ExtensionSystem::Get(profile)->process_manager()->
+          GetBackgroundHostForExtension(web_contents->GetURL().host());
+
+  if (!extension_host || extension_host->host_contents() != web_contents)
+    return "";
+
+  return extension_host->extension()->name();
 }
diff --git a/chrome/browser/devtools/frontend/devtools_discovery_page.html b/chrome/browser/devtools/frontend/devtools_discovery_page.html
index 85c03b8..5eaf704 100644
--- a/chrome/browser/devtools/frontend/devtools_discovery_page.html
+++ b/chrome/browser/devtools/frontend/devtools_discovery_page.html
@@ -120,7 +120,7 @@ function appendItem(item_object) {
 
   var text = document.createElement("div");
   text.className = "text";
-  text.innerText = item_object.title;
+  text.innerText = item_object.description || item_object.title;
   text.style.cssText = "background-image:url(" +
                        item_object.faviconUrl + ")";
   frontend_ref.appendChild(text);