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

ash/launcher/launcher_view.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 "ash/launcher/launcher_view.h"
 
 #include "ash/launcher/app_launcher_button.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_window_cycler.h"
@@ skipping 291 matching lines @@
   views::View* view = NULL;
   switch (item.type) {
     case TYPE_TABBED: {
       TabbedLauncherButton* button = new TabbedLauncherButton(this, this);
       button->SetTabImage(item.image, item.num_tabs);
       button->set_context_menu_controller(this);
       view = button;
       break;
     }
 
-    case TYPE_APP: {
+    case TYPE_APP:
+    case TYPE_PANEL: {
       AppLauncherButton* button = new AppLauncherButton(this, this);
       button->SetAppImage(item.image);
       view = button;
       button->set_context_menu_controller(this);
       break;
     }
 
     case TYPE_APP_LIST: {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       views::ImageButton* button = new AppLauncherButton(this, this);
@@ skipping 87 matching lines @@
 }
 
 void LauncherView::GetOverflowItems(std::vector<LauncherItem>* items) {
   int index = 0;
   while (index < view_model_->view_size() &&
          view_model_->view_at(index)->visible()) {
     index++;
   }
   while (index < view_model_->view_size()) {
     const LauncherItem& item = model_->items()[index];
-    if (item.type == TYPE_TABBED || item.type == TYPE_APP)
+    if (item.type == TYPE_TABBED ||
+        item.type == TYPE_APP ||
+        item.type == TYPE_PANEL)
       items->push_back(item);
     index++;
   }
 }
 
 void LauncherView::ShowOverflowMenu() {
 #if !defined(OS_MACOSX)
   if (!delegate_)
     return;
 
@@ skipping 122 matching lines @@
       TabbedLauncherButton* button = static_cast<TabbedLauncherButton*>(view);
       gfx::Size pref = button->GetPreferredSize();
       button->SetTabImage(item.image, item.num_tabs);
       if (pref != button->GetPreferredSize())
         AnimateToIdealBounds();
       else
         button->SchedulePaint();
       break;
     }
 
-    case TYPE_APP: {
+    case TYPE_APP:
+    case TYPE_PANEL: {
       AppLauncherButton* button = static_cast<AppLauncherButton*>(view);
       button->SetAppImage(item.image);
       button->SchedulePaint();
       break;
     }
 
     default:
       break;
   }
 }
@@ skipping 49 matching lines @@
   if (!delegate_)
     return string16();
   int view_index = view_model_->GetIndexOfView(view);
   // May be -1 while in the process of animating closed.
   if (view_index == -1)
     return string16();
 
   switch (model_->items()[view_index].type) {
     case TYPE_TABBED:
     case TYPE_APP:
+    case TYPE_PANEL:
       return delegate_->GetTitle(model_->items()[view_index]);
 
     case TYPE_APP_LIST:
       return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
 
     case TYPE_BROWSER_SHORTCUT:
       return l10n_util::GetStringUTF16(IDS_AURA_CYCLER_TITLE);
   }
   return string16();
 }
 
 void LauncherView::ButtonPressed(views::Button* sender,
                                  const views::Event& event) {
   if (sender == overflow_button_)
     ShowOverflowMenu();
 
   if (!delegate_)
     return;
   int view_index = view_model_->GetIndexOfView(sender);
   // May be -1 while in the process of animating closed.
   if (view_index == -1)
     return;
 
   switch (model_->items()[view_index].type) {
     case TYPE_TABBED:
     case TYPE_APP:
+    case TYPE_PANEL:
       delegate_->ItemClicked(model_->items()[view_index]);
       break;
 
     case TYPE_APP_LIST:
       Shell::GetInstance()->ToggleAppList();
       break;
 
     case TYPE_BROWSER_SHORTCUT:
       cycler_->Cycle();
       break;
@@ skipping 25 matching lines @@
   // code.
   if (launcher_menu_runner_->RunMenuAt(
           source->GetWidget(), NULL, gfx::Rect(p, gfx::Size()),
           views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED)
     return;
 #endif
 }
 
 }  // namespace internal
 }  // namespace ash