Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in …

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 <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 668 matching lines @@
               item.is_incognito ?
                   TabbedLauncherButton::STATE_INCOGNITO :
                   TabbedLauncherButton::STATE_NOT_INCOGNITO);
       button->SetTabImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = LauncherButton::Create(
           this, this, tooltip_->shelf_layout_manager());
       button->SetImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
@@ skipping 118 matching lines @@
   bounds_animator_->StopAnimatingView(drag_view_);
 }
 
 bool LauncherView::SameDragType(LauncherItemType typea,
                                 LauncherItemType typeb) const {
   switch (typea) {
     case TYPE_TABBED:
     case TYPE_PLATFORM_APP:
       return (typeb == TYPE_TABBED || typeb == TYPE_PLATFORM_APP);
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_APP_LIST:
     case TYPE_APP_PANEL:
     case TYPE_BROWSER_SHORTCUT:
       return typeb == typea;
   }
   NOTREACHED();
   return false;
 }
 
 std::pair<int, int> LauncherView::GetDragRange(int index) {
@@ skipping 253 matching lines @@
         button->SchedulePaint();
       ReflectItemStatus(item, button);
       break;
     }
     case TYPE_BROWSER_SHORTCUT:
       if (!Shell::IsLauncherPerDisplayEnabled())
         break;
       // Fallthrough for the new Launcher since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = static_cast<LauncherButton*>(view);
       ReflectItemStatus(item, button);
       // The browser shortcut is currently not a "real" item and as such the
       // the image is bogous as well. We therefore keep the image as is for it.
       if (item.type != TYPE_BROWSER_SHORTCUT)
         button->SetImage(item.image);
       button->SchedulePaint();
       break;
@@ skipping 101 matching lines @@
 string16 LauncherView::GetAccessibleName(const views::View* view) {
   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_PANEL:
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
       return delegate_->GetTitle(model_->items()[view_index]);
 
     case TYPE_APP_LIST:
       return model_->status() == LauncherModel::STATUS_LOADING ?
           l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) :
           l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
 
     case TYPE_BROWSER_SHORTCUT:
       return Shell::GetInstance()->delegate()->GetProductName();
@@ skipping 21 matching lines @@
 
   {
     // Slow down activation animations if shift key is pressed.
     scoped_ptr<ScopedAnimationSetter> slowing_animations;
     if (event.IsShiftDown())
       slowing_animations.reset(new ScopedAnimationSetter());
 
   // Collect usage statistics before we decide what to do with the click.
   switch (model_->items()[view_index].type) {
     case TYPE_APP_SHORTCUT:
+    case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
       Shell::GetInstance()->delegate()->RecordUserMetricsAction(
           UMA_LAUNCHER_CLICK_ON_APP);
       // Fallthrough
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
       delegate_->ItemClicked(model_->items()[view_index], event);
       break;
 
       case TYPE_APP_LIST:
@@ skipping 109 matching lines @@
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
                     OnLauncherIconPositionsChanged());
   PreferredSizeChanged();
 }
 
 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
 }
 
 }  // namespace internal
 }  // namespace ash