mash: Cleanup ash shelf application menu code.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
index eca80ab314589a7fdc8be34c7a5baf081fa017f8..e7146a487fb058afd03cf05a0c8e106c68f0f2be 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
@@ -5,27 +5,23 @@
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_APP_MENU_ITEM_BROWSER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_APP_MENU_ITEM_BROWSER_H_
 
+#include "ash/public/cpp/shelf_application_menu_item.h"
 #include "base/macros.h"
-#include "base/values.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 
-// A menu item controller for a running browser. It gets created when an
-// application list gets created. It's main purpose is to add the activation
-// method to the |ChromeLauncherAppMenuItem| class.
+// A shelf application menu item for a running browser.
 class ChromeLauncherAppMenuItemBrowser : public content::NotificationObserver,
-                                         public ChromeLauncherAppMenuItem {
+                                         public ash::ShelfApplicationMenuItem {

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

super nit: I would reorder the base classes, since SAMI is more important, this
also matches the function order below

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

Done.

  public:
   ChromeLauncherAppMenuItemBrowser(const base::string16 title,
                                    const gfx::Image* icon,
-                                   Browser* browser,
-                                   bool has_leading_separator);
+                                   Browser* browser);
   ~ChromeLauncherAppMenuItemBrowser() override;
 
-  bool IsEnabled() const override;
+  // ash::ShelfApplicationMenuItem:
   void Execute(int event_flags) override;
 
  private: