mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

ash/common/shelf/shelf_model.cc

 // Copyright 2013 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_model.h"
 
 #include <algorithm>
 
-#include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int ShelfItemTypeToWeight(ShelfItemType type) {
   switch (type) {
     case TYPE_APP_LIST:
       // TODO(skuhne): If the app list item becomes movable again, this need
@@ skipping 132 matching lines @@
 int ShelfModel::FirstPanelIndex() const {
   ShelfItem weight_dummy;
   weight_dummy.type = TYPE_APP_PANEL;
   return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                           CompareByWeight) -
          items_.begin();
 }
 
 void ShelfModel::SetShelfItemDelegate(
     ShelfID id,
-    std::unique_ptr<ShelfItemDelegate> item_delegate) {
+    std::unique_ptr<mojom::ShelfItemDelegate> item_delegate) {
   // If another ShelfItemDelegate is already registered for |id|, we assume
   // that this request is replacing ShelfItemDelegate for |id| with
   // |item_delegate|.
   RemoveShelfItemDelegate(id);
 
   for (auto& observer : observers_)
     observer.OnSetShelfItemDelegate(id, item_delegate.get());
 
   id_to_item_delegate_map_[id] = std::move(item_delegate);
 }
 
-ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
+mojom::ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     return id_to_item_delegate_map_[id].get();
   return nullptr;
 }
 
 void ShelfModel::AddObserver(ShelfModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ShelfModel::RemoveObserver(ShelfModelObserver* observer) {
@@ skipping 17 matching lines @@
 
   return index;
 }
 
 void ShelfModel::RemoveShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     id_to_item_delegate_map_.erase(id);
 }
 
 }  // namespace ash