mash: Cleanup ash shelf application menu code.

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 35 matching lines @@
     window_id_to_title_[id] = title;
   }
   const std::map<uint32_t, base::string16>& window_id_to_title() const {
     return window_id_to_title_;
   }
 
   const base::string16& title() { return title_; }
   void set_title(const base::string16& title) { title_ = title; }
 
  private:
-  // This application menu model for ShelfItemDelegateMus lists open windows.
-  class ShelfMenuModelMus : public ui::SimpleMenuModel,
-                            public ui::SimpleMenuModel::Delegate {
-   public:
-    explicit ShelfMenuModelMus(ShelfItemDelegateMus* item_delegate)
-        : ui::SimpleMenuModel(this), item_delegate_(item_delegate) {
-      AddSeparator(ui::SPACING_SEPARATOR);
-      AddItem(0, item_delegate_->title());
-      AddSeparator(ui::SPACING_SEPARATOR);
-      for (const auto& window : item_delegate_->window_id_to_title())
-        AddItem(window.first, window.second);
-      AddSeparator(ui::SPACING_SEPARATOR);
-    }
-    ~ShelfMenuModelMus() override {}
-
-    // ui::SimpleMenuModel::Delegate:
-    bool IsCommandIdChecked(int command_id) const override { return false; }
-    bool IsCommandIdEnabled(int command_id) const override {
-      return command_id > 0;
-    }
-    void ExecuteCommand(int command_id, int event_flags) override {
-      NOTIMPLEMENTED();
-    }
-
-   private:
-    ShelfItemDelegateMus* item_delegate_;
-
-    DISALLOW_COPY_AND_ASSIGN(ShelfMenuModelMus);
-  };
-
   // ShelfItemDelegate:
   ShelfItemDelegate::PerformedAction ItemSelected(
       const ui::Event& event) override {
     if (window_id_to_title_.empty()) {
       delegate_->LaunchItem();
       return kNewWindowCreated;
     }
     if (window_id_to_title_.size() == 1) {
       // TODO(mash): Activate the window and return kExistingWindowActivated.
       NOTIMPLEMENTED();
     }
     return kNoAction;
   }
 
-  ui::SimpleMenuModel* CreateApplicationMenu(int event_flags) override {
-    return new ShelfMenuModelMus(this);
+  ShelfApplicationMenuItems GetAppMenuItems(int event_flags) override {
+    ShelfApplicationMenuItems items;
+    for (const auto& window : window_id_to_title_)

[James Cook, 2017/02/06 17:30:21]

nit: {}

[msw, 2017/02/07 09:12:01]

Done.

+      items.push_back(
+          base::MakeUnique<ShelfApplicationMenuItem>(window.second, nullptr));
+    return items;
   }
 
   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