[ash] Add TYPE_DIALOG and its item's LauncherContextMenu

ash/shelf/shelf_view.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.

[sky, 2014/01/08 14:39:14]

Don't change the year here.

[simonhong, 2014/01/09 00:38:24]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_image_view.h"
@@ skipping 899 matching lines @@
   overflow_button_->SetBoundsRect(ideal_bounds.overflow_bounds);
 }
 
 views::View* ShelfView::CreateViewForItem(const LauncherItem& item) {
   views::View* view = NULL;
   switch (item.type) {
     case TYPE_BROWSER_SHORTCUT:
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
+    case TYPE_DIALOG:
     case TYPE_APP_PANEL: {
       ShelfButton* button = ShelfButton::Create(this, this, layout_manager_);
       button->SetImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
     case TYPE_APP_LIST: {
       if (ash::switches::UseAlternateShelfLayout()) {
@@ skipping 314 matching lines @@
 bool ShelfView::SameDragType(LauncherItemType typea,
                              LauncherItemType typeb) const {
   switch (typea) {
     case TYPE_APP_SHORTCUT:
     case TYPE_BROWSER_SHORTCUT:
       return (typeb == TYPE_APP_SHORTCUT || typeb == TYPE_BROWSER_SHORTCUT);
     case TYPE_APP_LIST:
     case TYPE_PLATFORM_APP:
     case TYPE_WINDOWED_APP:
     case TYPE_APP_PANEL:
+    case TYPE_DIALOG:
       return typeb == typea;
     case TYPE_UNDEFINED:
       NOTREACHED() << "LauncherItemType must be set.";
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 std::pair<int, int> ShelfView::GetDragRange(int index) {
@@ skipping 342 matching lines @@
   }
 
   views::View* view = view_model_->view_at(model_index);
   switch (item.type) {
     case TYPE_BROWSER_SHORTCUT:
       // Fallthrough for the new Shelf since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
+    case TYPE_DIALOG:
     case TYPE_APP_PANEL: {
       ShelfButton* button = static_cast<ShelfButton*>(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 154 matching lines @@
         Shell::GetInstance()->metrics()->RecordUserMetricsAction(
             UMA_LAUNCHER_CLICK_ON_APP);
         break;
 
       case TYPE_APP_LIST:
         Shell::GetInstance()->metrics()->RecordUserMetricsAction(
             UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON);
         break;
 
       case TYPE_APP_PANEL:
+      case TYPE_DIALOG:
         break;
 
       case TYPE_UNDEFINED:
         NOTREACHED() << "LauncherItemType must be set.";
         break;
     }
 
     ShelfItemDelegate* item_delegate =
         item_manager_->GetShelfItemDelegate(model_->items()[view_index].id);
     if (!item_delegate->ItemSelected(event))
@@ skipping 217 matching lines @@
       break;
     case ash::SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace internal
 }  // namespace ash