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

chrome/browser/ui/views/aura/launcher/launcher_updater.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 "chrome/browser/ui/views/aura/launcher/launcher_updater.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 33 matching lines @@
 LauncherUpdater::~LauncherUpdater() {
   tab_model_->RemoveObserver(this);
   if (item_id_ != -1)
     launcher_delegate_->LauncherItemClosed(item_id_);
   for (AppTabMap::iterator i = app_map_.begin(); i != app_map_.end(); ++i)
     launcher_delegate_->LauncherItemClosed(i->second.id);
 }
 
 void LauncherUpdater::Init() {
   tab_model_->AddObserver(this);
-  if (type_ == TYPE_APP) {
+  if (type_ == TYPE_APP || type_ == TYPE_PANEL) {
     // App type never changes, create the launcher item immediately.
+    ChromeLauncherDelegate::AppType app_type =
+        type_ == TYPE_PANEL ? ChromeLauncherDelegate::APP_TYPE_PANEL
+        : ChromeLauncherDelegate::APP_TYPE_WINDOW;
     item_id_ = launcher_delegate_->CreateAppLauncherItem(
-        this, app_id_, ChromeLauncherDelegate::APP_TYPE_WINDOW);
+        this, app_id_, app_type);
   } else {
     // Determine if we have any tabs that should get launcher items.
     std::vector<TabContentsWrapper*> app_tabs;
     for (int i = 0; i < tab_model_->count(); ++i) {
       TabContentsWrapper* tab = tab_model_->GetTabContentsAt(i);
       if (!launcher_delegate_->GetAppID(tab).empty())
         app_tabs.push_back(tab);
     }
 
     if (static_cast<int>(app_tabs.size()) != tab_model_->count())
       CreateTabbedItem();
 
     // Create items for the app tabs.
     for (size_t i = 0; i < app_tabs.size(); ++i)
       AddAppItem(app_tabs[i]);
   }
   UpdateLauncher(tab_model_->GetActiveTabContents());
 }
 
 // static
 LauncherUpdater* LauncherUpdater::Create(Browser* browser) {
   Type type;
   std::string app_id;
   if (browser->type() == Browser::TYPE_TABBED) {
     type = TYPE_TABBED;
   } else if (browser->is_app()) {
-    type = TYPE_APP;
+    type = browser->is_type_panel() ? TYPE_PANEL : TYPE_APP;
     app_id = web_app::GetExtensionIdFromApplicationName(browser->app_name());
   } else {
     return NULL;
   }
   LauncherUpdater* icon_updater = new LauncherUpdater(
       browser->window()->GetNativeHandle(), browser->tabstrip_model(),
       ChromeLauncherDelegate::instance(), type, app_id);
   icon_updater->Init();
   return icon_updater;
 }
@@ skipping 40 matching lines @@
     int item_index = launcher_model()->ItemIndexByID(item_id_);
     if (item_index == -1)
       return;
     launcher_model()->SetPendingUpdate(item_index);
   }
 }
 
 void LauncherUpdater::TabInsertedAt(TabContentsWrapper* contents,
                                     int index,
                                     bool foreground) {
-  if (type_ == TYPE_APP)
+  if (type_ != TYPE_TABBED)
     return;
 
   UpdateAppTabState(contents, UPDATE_TAB_INSERTED);
 }
 
 void LauncherUpdater::TabReplacedAt(TabStripModel* tab_strip_model,
                                     TabContentsWrapper* old_contents,
                                     TabContentsWrapper* new_contents,
                                     int index) {
   AppTabMap::iterator i = app_map_.find(old_contents);
   if (i != app_map_.end()) {
     AppTabDetails details = i->second;
     app_map_.erase(i);
     i = app_map_.end();
     app_map_[new_contents] = details;
     UpdateAppTabState(new_contents, UPDATE_TAB_CHANGED);
   }
 }
 
 void LauncherUpdater::TabDetachedAt(TabContentsWrapper* contents, int index) {
-  if (type_ == TYPE_APP)
+  if (type_ != TYPE_TABBED)
     return;
 
   UpdateAppTabState(contents, UPDATE_TAB_REMOVED);
   if (tab_model_->count() <= 3) {
     // We can't rely on the active tab at this point as the model hasn't fully
     // adjusted itself. We can rely on the count though.
     int item_index = launcher_model()->ItemIndexByID(item_id_);
     if (item_index == -1)
       return;
 
     if (launcher_model()->items()[item_index].type == ash::TYPE_TABBED) {
       ash::LauncherItem new_item(launcher_model()->items()[item_index]);
       new_item.num_tabs = tab_model_->count();
       launcher_model()->Set(item_index, new_item);
     }
   }
 }
 
 void LauncherUpdater::UpdateLauncher(TabContentsWrapper* tab) {
   if (type_ == TYPE_APP)

[stevenjb, 2012/03/03 00:02:06]

Panels want to change their icon when the favicon changes; their behavior is
somewhere between App and Tabbed behavior.

[sky, 2012/03/03 00:13:05]

Ok, makes sense. But I don't think the ash portion of the launcher needs to
distinguish between APP and PANEL, right? I'm saying keep TYPE_PANEL only to the
chrome side of things.

     return;  // TYPE_APP is entirely maintained by ChromeLauncherDelegate.
 
   if (!tab)
     return;  // Assume the window is going to be closed if there are no tabs.
 
   int item_index = launcher_model()->ItemIndexByID(item_id_);
   if (item_index == -1)
     return;
 
-  ash::LauncherItem item;
-  if (launcher_model()->items()[item_index].type == ash::TYPE_APP) {
+  ash::LauncherItem item = launcher_model()->items()[item_index];
+  if (type_ == TYPE_PANEL) {
+    // Update the icon for app panels.
+    // TODO(stevenjb): Get a large favicon for the launcher.

[sky, 2012/03/02 23:08:53]

How come you don't want the same logic as apps use?

+    if (!tab->favicon_tab_helper()->GetFavicon().empty())
+      item.image = tab->favicon_tab_helper()->GetFavicon();
+    else if (tab->extension_tab_helper()->GetExtensionAppIcon())
+      item.image = *tab->extension_tab_helper()->GetExtensionAppIcon();
+    else
+      item.image = Extension::GetDefaultIcon(true);
+  } else if (launcher_model()->items()[item_index].type == ash::TYPE_APP) {
     // Use the app icon if we can.
     if (tab->extension_tab_helper()->GetExtensionAppIcon())
       item.image = *tab->extension_tab_helper()->GetExtensionAppIcon();
     else
       item.image = tab->favicon_tab_helper()->GetFavicon();
   } else {
     item.num_tabs = tab_model_->count();
     if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
       item.image = tab->favicon_tab_helper()->GetFavicon();
       if (item.image.empty()) {
@@ skipping 115 matching lines @@
       *tab = i->first;
       return true;
     }
   }
   return false;
 }
 
 ash::LauncherModel* LauncherUpdater::launcher_model() {
   return launcher_delegate_->model();
 }