[Extensions UI Mac] Delete the overflow container when the menu closes

chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 369 matching lines @@
 }
 
 - (void)menuDidClose:(NSMenu*)menu {
   [super menuDidClose:menu];
   // We don't need to observe changes to zoom or toolbar size when the menu is
   // closed, since we instantiate it with the proper value and recreate the menu
   // on each show. (We do this in -menuNeedsUpdate:, which is called when the
   // menu is about to be displayed at the start of a tracking session.)
   zoom_level_observer_.reset();
   toolbar_actions_bar_observer_.reset();
+  // Make sure to reset() the BrowserActionsController since the view will also
+  // be destroyed. If a new one's needed, it'll be created when we create the
+  // model in -menuNeedsUpdate:.
+  browserActionsController_.reset();
   UMA_HISTOGRAM_TIMES("Toolbar.AppMenuTimeToAction",
                       base::TimeTicks::Now() - menuOpenTime_);
   menuOpenTime_ = base::TimeTicks();
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
+  // We should never have a BrowserActionsController before creating the menu.
+  DCHECK(!browserActionsController_.get());
+
   // First empty out the menu and create a new model.
   [self removeAllItems:menu];
-  // Delete the BrowserActionsController; if a new one's needed, it'll be
-  // created as we add items to the menu.
-  browserActionsController_.reset();
   [self createModel];
   [menu setMinimumWidth:0];
 
   // Create a new menu, which cannot be swapped because the tracking is about to
   // start, so simply copy the items.
   NSMenu* newMenu = [self menuFromModel:model_];
   NSArray* itemArray = [newMenu itemArray];
   [self removeAllItems:newMenu];
   for (NSMenuItem* item in itemArray) {
     [menu addItem:item];
@@ skipping 226 matching lines @@
   // (and thus, after all our ability to adjust it normally). Throw in the
   // towel, and simply don't let the frame move from where it's supposed to be.
   // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround,
   // but unlikely unless we replace the Cocoa menu implementation.
   NSView* containerSuperview = [overflowActionsContainerView_ superview];
   if (NSMinX([containerSuperview frame]) != 0)
     [containerSuperview setFrameOrigin:NSZeroPoint];
 }
 
 @end  // @implementation AppMenuButtonViewController