mash: Remove shelf app menu item objects.

ash/common/shelf/shelf_controller.cc

 // Copyright 2016 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_controller.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
@@ skipping 53 matching lines @@
     }
     if (window_id_to_title_.size() == 1) {
       // TODO(mash): Activate the window and return
       // SHELF_ACTION_WINDOW_ACTIVATED.
       NOTIMPLEMENTED();
     }
     return SHELF_ACTION_NONE;
   }
 
   ShelfAppMenuItemList GetAppMenuItems(int event_flags) override {
-    ShelfAppMenuItemList items;
-    for (const auto& window : window_id_to_title_) {
-      items.push_back(
-          base::MakeUnique<ShelfApplicationMenuItem>(window.second));
-    }
-    return items;
+    // Return an empty item list to avoid showing an application menu.
+    return ShelfAppMenuItemList();
+  }
+
+  void ExecuteCommand(uint32_t command_id, int event_flags) override {
+    // This delegate does not support showing an application menu.
+    NOTIMPLEMENTED();
   }
 
   void Close() override { NOTIMPLEMENTED(); }
 
   mojom::ShelfItemDelegateAssociatedPtr delegate_;
   bool pinned_ = false;
   std::map<uint32_t, base::string16> window_id_to_title_;
   base::string16 title_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
@@ skipping 144 matching lines @@
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id];
   int index = model_.ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_.ItemByID(shelf_id);
   item.image = GetShelfIconFromBitmap(image);
   model_.Set(index, item);
 }
 
 }  // namespace ash