Ash: Fix browser icon menu model lifetime

The menu model needs to be cleaned up if the menu is suppressed for being
too short.

BUG=406609
TEST=manual, see bug

Review URL: https://codereview.chromium.org/486193004

Cr-Commit-Position: refs/heads/master@{#291600}

ash/shelf/shelf_view.cc

@@ -1715,14 +1715,15 @@ bool ShelfView::ShowListMenuForView(const ShelfItem& item,
                                     const ui::Event& event) {
   ShelfItemDelegate* item_delegate =
       item_manager_->GetShelfItemDelegate(item.id);
-  list_menu_model_.reset(item_delegate->CreateApplicationMenu(event.flags()));
+  scoped_ptr<ui::MenuModel> list_menu_model(
+      item_delegate->CreateApplicationMenu(event.flags()));
 
   // Make sure we have a menu and it has at least two items in addition to the
   // application title and the 3 spacing separators.
-  if (!list_menu_model_.get() || list_menu_model_->GetItemCount() <= 5)
+  if (!list_menu_model.get() || list_menu_model->GetItemCount() <= 5)
     return false;
 
-  ShowMenu(list_menu_model_.get(),
+  ShowMenu(list_menu_model.get(),
            source,
            gfx::Point(),
            false,

ash/shelf/shelf_view.h

@@ -369,8 +369,6 @@ class ASH_EXPORT ShelfView : public views::View,
 
   scoped_ptr<views::FocusSearch> focus_search_;
 
-  scoped_ptr<ui::MenuModel> list_menu_model_;
-
   scoped_ptr<ui::MenuModel> context_menu_model_;
 
   scoped_ptr<views::MenuRunner> launcher_menu_runner_;

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

@@ -20,10 +20,13 @@ ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser(
     bool has_leading_separator)
     : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
       browser_(browser) {
+  DCHECK(browser);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_CLOSING,
                  content::Source<Browser>(browser));
 }
+ChromeLauncherAppMenuItemBrowser::~ChromeLauncherAppMenuItemBrowser() {
+}
 
 bool ChromeLauncherAppMenuItemBrowser::IsActive() const {
   return browser_ == chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());

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

@@ -22,6 +22,8 @@ class ChromeLauncherAppMenuItemBrowser : public content::NotificationObserver,
                                    const gfx::Image* icon,
                                    Browser* browser,
                                    bool has_leading_separator);
+  virtual ~ChromeLauncherAppMenuItemBrowser();
+
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsEnabled() const OVERRIDE;
   virtual void Execute(int event_flags) OVERRIDE;