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

chrome/browser/extensions/extension_tabs_module.cc

Index: chrome/browser/extensions/extension_tabs_module.cc
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 832e6efaa8bbb8f3c0f563f36a5dc50b1f625439..018de67239e46bf09ff24f9a7f61fb8efd3e8d18 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
@@ -615,8 +616,12 @@ bool CreateWindowFunction::RunImpl() {
         (window_type == Browser::TYPE_PANEL ? panel_bounds : popup_bounds),
         window_profile);
   }
-  for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i)
-    new_window->AddSelectedTabWithURL(*i, content::PAGE_TRANSITION_LINK);
+  for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
+    TabContentsWrapper* tab = new_window->AddSelectedTabWithURL(
+        *i, content::PAGE_TRANSITION_LINK);
+    if (window_type == Browser::TYPE_PANEL)
+      tab->extension_tab_helper()->SetExtensionAppIconById(extension_id);

[Mihai Parparita -not on Chrome, 2012/03/05 23:28:29]

Drive-by: Why can't SetExtensionAppById be used? That also sets the icon.

[stevenjb, 2012/03/05 23:50:55]

I tried that first, but it triggered a DCHECK on
extension->GetFullLaunchURL().is_valid() (the url is empty). I opted to just set
the icon instead of changing the DCHECK and setting the extension, since it
could potentially have other subtle side effects that I would would like to
avoid debugging in R19. I'd rather save the debugging for when we convert panels
to not be browsers for R20.

+  }
   if (contents) {
     TabStripModel* target_tab_strip = new_window->tabstrip_model();
     target_tab_strip->InsertTabContentsAt(urls.size(), contents,