Ash: Fix browser icon menu model lifetime

ash/shelf/shelf_view.cc

 // Copyright (c) 2012 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.
 
 #include "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 1701 matching lines @@
 
 bool ShelfView::ShowListMenuForView(const ShelfItem& item,
                                     views::View* source,
                                     const ui::Event& event) {
   ShelfItemDelegate* item_delegate =
       item_manager_->GetShelfItemDelegate(item.id);
   list_menu_model_.reset(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) {
+    list_menu_model_.reset();
     return false;
+  }
 
   ShowMenu(list_menu_model_.get(),
            source,
            gfx::Point(),
            false,
            ui::GetMenuSourceTypeForEvent(event));

[Mr4D (OOO till 08-26), 2014/08/22 23:06:15]

Looking at the code I am sure that you would need the same here.

Looking more I think that this code was because of some sub menu handling - but
there isn't a sub menu anymore.

As such: Upon return of ShowMenu the menu should be gone and the
|list_menu_model_| should be able to get deleted.

As such I would suggest to remove the |list_menu_model_| member and replace it
with a local incarnation of a scoped pointer deleting the model upon exiting of
this function.

I gave it a whirl (quick debugging) and as far as I can see it my assumption
should be correct.

   return true;
 }
 
 void ShelfView::ShowContextMenuForView(views::View* source,
                                        const gfx::Point& point,
                                        ui::MenuSourceType source_type) {
   int view_index = view_model_->GetIndexOfView(source);
   if (view_index == -1) {
     Shell::GetInstance()->ShowContextMenu(point, source_type);
     return;
@@ skipping 177 matching lines @@
       distance = bounds.x() - coordinate.x();
       break;
     case SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash