mash: Cleanup ash shelf application menu code.

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

 // Copyright (c) 2013 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_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 28 matching lines @@
   void SetShelfIDForBrowserWindowContents(Browser* browser,
                                           content::WebContents* web_contents);
 
   // Check if there is any active browsers windows.
   bool IsListOfActiveBrowserEmpty();
 
   // LauncherItemController overrides:
   void Launch(ash::LaunchSource source, int event_flags) override;
   ShelfItemDelegate::PerformedAction Activate(
       ash::LaunchSource source) override;
-  ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
   ash::ShelfItemDelegate::PerformedAction ItemSelected(
       const ui::Event& event) override;
-  ui::SimpleMenuModel* CreateApplicationMenu(int event_flags) override;
+  ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
   void Close() override;
 
  private:
   // Get the favicon for the browser list entry for |web_contents|.
   // Note that for incognito windows the incognito icon will be returned.
   gfx::Image GetBrowserListIcon(content::WebContents* web_contents) const;
 
   // Get the title for the browser list entry for |web_contents|.
   // If |web_contents| has not loaded, returns "Net Tab".
   base::string16 GetBrowserListTitle(content::WebContents* web_contents) const;
@@ skipping 12 matching lines @@
 
   // Get a list of active browsers.
   BrowserList::BrowserVector GetListOfActiveBrowsers();
 
   ash::ShelfModel* shelf_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_