Launch panels as popup windows in Aura, and add separate launcher icon logic for panels.

chrome/browser/extensions/extension_tab_helper.cc

Index: chrome/browser/extensions/extension_tab_helper.cc
diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc
index e7f1fe9d18289b58d9b3c75201fc5430127baf4d..1b8d3cbe54beb1730b9b4f266263f6a601454423 100644
--- a/chrome/browser/extensions/extension_tab_helper.cc
+++ b/chrome/browser/extensions/extension_tab_helper.cc
@@ -67,21 +67,18 @@ void ExtensionTabHelper::SetExtensionApp(const Extension* extension) {
 
 void ExtensionTabHelper::SetExtensionAppById(
     const std::string& extension_app_id) {
-  if (extension_app_id.empty())
-    return;
-
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  ExtensionService* extension_service = profile->GetExtensionService();
-  if (!extension_service || !extension_service->is_ready())
-    return;
-
-  const Extension* extension =
-      extension_service->GetExtensionById(extension_app_id, false);
+  const Extension* extension = GetExtension(extension_app_id);
   if (extension)
     SetExtensionApp(extension);
 }
 
+void ExtensionTabHelper::SetExtensionAppIconById(
+    const std::string& extension_app_id) {
+  const Extension* extension = GetExtension(extension_app_id);
+  if (extension)
+    UpdateExtensionAppIcon(extension);
+}
+
 SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() {
   if (extension_app_icon_.empty())
     return NULL;
@@ -235,6 +232,22 @@ void ExtensionTabHelper::OnRequest(
                                           web_contents()->GetRenderViewHost());
 }
 
+const Extension* ExtensionTabHelper::GetExtension(
+    const std::string& extension_app_id) {
+  if (extension_app_id.empty())
+    return NULL;
+
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+  ExtensionService* extension_service = profile->GetExtensionService();
+  if (!extension_service || !extension_service->is_ready())
+    return NULL;
+
+  const Extension* extension =
+      extension_service->GetExtensionById(extension_app_id, false);
+  return extension;
+}
+
 void ExtensionTabHelper::UpdateExtensionAppIcon(const Extension* extension) {
   extension_app_icon_.reset();