mash: Remove shelf app menu item objects.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
-#include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 namespace extensions {
 class AppWindow;
 }
 
 class ChromeLauncherController;
 
 class ExtensionAppWindowLauncherItemController

[James Cook, 2017/03/01 19:50:48]

nit: while you're here, could you add a comment about which type of item/icon
this is?

[msw, 2017/03/02 02:59:20]

Done for this and ArcAppWindowLauncherItemController; I also slightly updated
AppWindowLauncherItemController's comment.

     : public AppWindowLauncherItemController {
  public:
   ExtensionAppWindowLauncherItemController(
       const std::string& app_id,
       const std::string& launch_id,
       ChromeLauncherController* controller);
 
   ~ExtensionAppWindowLauncherItemController() override;
 
   void AddAppWindow(extensions::AppWindow* app_window);
 
-  // LauncherItemController overrides:
+  // AppWindowLauncherItemController:
   ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
-
- protected:
-  // AppWindowLauncherItemController:
-  void OnWindowRemoved(ui::BaseWindow* window) override;
+  void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
 
  private:
-  using WindowToAppWindow =
-      std::map<const ui::BaseWindow*, extensions::AppWindow*>;
-
-  WindowToAppWindow window_to_app_window_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_