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

chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc

Index: chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc
diff --git a/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc b/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc
index 625452eaaed882b553765f6f7a06ac179a392857..cedd9533285ff4e5fb9983d2c67b18b43080ad48 100644
--- a/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc
+++ b/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc
@@ -39,6 +39,7 @@ namespace {
 
 // See description in PersistPinnedState().
 const char kAppIDPath[] = "id";
+const char kAppTypePanel[] = "panel";
 const char kAppTypePath[] = "type";
 const char kAppTypeTab[] = "tab";
 const char kAppTypeWindow[] = "window";
@@ -99,8 +100,13 @@ void ChromeLauncherDelegate::Init() {
       if (app->GetString(kAppIDPath, &app_id) &&
           app->GetString(kAppTypePath, &type_string) &&
           app_icon_loader_->IsValidID(app_id)) {
-        AppType app_type = (type_string == kAppTypeWindow) ?
-            APP_TYPE_WINDOW : APP_TYPE_TAB;
+        AppType app_type;
+        if (type_string == kAppTypeWindow)
+          app_type = APP_TYPE_WINDOW;
+        else if (type_string == kAppTypePanel)
+          app_type = APP_TYPE_PANEL;
+        else
+          app_type = APP_TYPE_TAB;
         CreateAppLauncherItem(NULL, app_id, app_type);
       }
     }
@@ -175,6 +181,7 @@ ash::LauncherID ChromeLauncherDelegate::CreateAppLauncherItem(
       min_app_index : std::min(item_count, min_tab_index + 1);
   ash::LauncherID id = model_->next_id();
   ash::LauncherItem item(ash::TYPE_APP);
+  item.image = Extension::GetDefaultIcon(true);
   model_->Add(insert_index, item);
   DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end());
   id_to_item_map_[id].item_type = TYPE_APP;
@@ -292,7 +299,8 @@ void ChromeLauncherDelegate::Open(ash::LauncherID id) {
     }
   } else {
     DCHECK_EQ(TYPE_APP, id_to_item_map_[id].item_type);
-    if (id_to_item_map_[id].app_type == APP_TYPE_TAB) {
+    AppType app_type = id_to_item_map_[id].app_type;
+    if (app_type == APP_TYPE_TAB) {
       const Extension* extension =
           profile_->GetExtensionService()->GetInstalledExtension(
               id_to_item_map_[id].app_id);
@@ -304,9 +312,10 @@ void ChromeLauncherDelegate::Open(ash::LauncherID id) {
     } else {
       std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
           id_to_item_map_[id].app_id);
+      Browser::Type browser_type = (app_type == APP_TYPE_PANEL) ?
+          Browser::TYPE_PANEL : Browser::TYPE_POPUP;
       Browser* browser = Browser::CreateForApp(
-          Browser::TYPE_POPUP, app_name, gfx::Rect(),
-          GetProfileForNewWindows());
+          browser_type, app_name, gfx::Rect(), GetProfileForNewWindows());
       browser->window()->Show();
     }
   }
@@ -352,12 +361,16 @@ std::string ChromeLauncherDelegate::GetAppID(TabContentsWrapper* tab) {
 
 void ChromeLauncherDelegate::SetAppImage(const std::string& id,
                                          SkBitmap* image) {
+  if (!image)
+    return;
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
-    if (i->second.app_id == id) {
+    if (i->second.app_id == id &&
+        (!i->second.updater ||
+         i->second.updater->type() != LauncherUpdater::TYPE_PANEL)) {

[sky, 2012/03/05 15:20:25]

Rather than this if, could you avoid asking for the image for type panels?

[stevenjb, 2012/03/05 19:50:06]

Looking through the code again (with a bit more familiarity now), I see that I
can avoid calling app_icon_loader_->FetchImage() in
ChromeLauncherDelegate::CreateAppLauncherItem(), and will add that.

However, we could still have an app, a panel it created, and a popup window it
created all in the launcher, all with the same app_id, so we need a way of
preventing updates with the same app_id from overriding icons set by the panel.
We may need an explicit way of doing this, but for now skipping panels (which
will always set their icon from LauncherUpdater::UpdateLauncher()) seems
easiest.

I did realize that we store item.app_type (not to be confused with
item.item_type), which does differentiate between PANEL and APP, so I will use
that instead of looking at the updater type.

       int index = model_->ItemIndexByID(i->first);
       ash::LauncherItem item = model_->items()[index];
-      item.image = image ? *image : Extension::GetDefaultIcon(true);
+      item.image = *image;
       model_->Set(index, item);
       // It's possible we're waiting on more than one item, so don't break.
     }
@@ -443,9 +456,13 @@ void ChromeLauncherDelegate::PersistPinnedState() {
           id_to_item_map_[id].pinned) {
         base::DictionaryValue* app_value = new base::DictionaryValue;
         app_value->SetString(kAppIDPath, id_to_item_map_[id].app_id);
-        const char* app_type_string =
-            id_to_item_map_[id].app_type == APP_TYPE_WINDOW ?
-            kAppTypeWindow : kAppTypeTab;
+        const char* app_type_string;
+        if (id_to_item_map_[id].app_type == APP_TYPE_WINDOW)
+          app_type_string = kAppTypeWindow;
+        else if (id_to_item_map_[id].app_type == APP_TYPE_PANEL)
+          app_type_string = kAppTypePanel;
+        else
+          app_type_string = kAppTypeTab;
         app_value->SetString(kAppTypePath, app_type_string);
         updater.Get()->Append(app_value);
       }