mash: Remove shelf app menu item objects.

ash/common/shelf/shelf_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/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/ash_constants.h"
@@ skipping 1599 matching lines @@
 }
 
 void ShelfView::OnSetShelfItemDelegate(ShelfID id,
                                        ShelfItemDelegate* item_delegate) {}
 
 bool ShelfView::ShowListMenuForView(const ShelfItem& item,
                                     views::View* source,
                                     const ui::Event& event,
                                     views::InkDrop* ink_drop) {
   ShelfItemDelegate* item_delegate = model_->GetShelfItemDelegate(item.id);
-  ShelfAppMenuItemList menu_items =
-      item_delegate->GetAppMenuItems(event.flags());
+  ShelfAppMenuItemList items = item_delegate->GetAppMenuItems(event.flags());
 
   // The application list menu should only show for two or more items; return
   // false here to ensure that other behavior is triggered (eg. activating or
   // minimizing a single associated window, or launching a pinned shelf item).
-  if (menu_items.size() < 2)
+  if (items.size() < 2)
     return false;
 
   ink_drop->AnimateToState(views::InkDropState::ACTIVATED);
   context_menu_id_ = item.id;
-  ShowMenu(base::MakeUnique<ShelfApplicationMenuModel>(item.title,
-                                                       std::move(menu_items)),
+  ShowMenu(base::MakeUnique<ShelfApplicationMenuModel>(
+               item.title, std::move(items), item_delegate),
            source, gfx::Point(), false, ui::GetMenuSourceTypeForEvent(event),
            ink_drop);
   return true;
 }
 
 void ShelfView::ShowContextMenuForView(views::View* source,
                                        const gfx::Point& point,
                                        ui::MenuSourceType source_type) {
   last_pressed_index_ = -1;
 
@@ skipping 133 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = wm_shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash