Remove LauncherItemController::type; use ShelfItems::type.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
index 38f3357bf87003e6c6a155d3ef0e10c829c916ec..ddeacd89d6614ff55ea4c0665c0cb53ac4fd9170 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
@@ -24,6 +24,8 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
   ash::ShelfID CreateAppLauncherItem(LauncherItemController* controller,
                                      const std::string& app_id,
                                      ash::ShelfItemStatus status) override;
+  const ash::ShelfItem& GetItem(ash::ShelfID id) const override;
+  void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
   void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
   void SetItemController(ash::ShelfID id,
                          LauncherItemController* controller) override;
@@ -61,7 +63,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
                                                 int event_flags) override;
   std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
       const std::string& app_id) override;
-  void ActivateShellApp(const std::string& app_id, int index) override;
+  void ActivateShellApp(const std::string& app_id, int window_index) override;
   bool IsWebContentHandledByApplication(content::WebContents* web_contents,
                                         const std::string& app_id) override;
   bool ContentCanBeHandledByGmailApp(
@@ -91,6 +93,9 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
   std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
       app_id_to_item_delegate_;
 
+  // A fake item used for the unimplemented GetItem() override.
+  const ash::ShelfItem fake_item_;

[James Cook, 2016/12/02 19:27:18]

optional: This could be a static ash::ShelfItem inside the GetItem() function.

[msw, 2016/12/02 19:37:57]

I tried that first and got error: declaration requires an exit-time destructor

+
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
 };