[Extensions Toolbar] Fix action pop out bug and views animation

chrome/browser/ui/cocoa/wrench_menu/wrench_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/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/bundle_locations.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/ui/zoom/zoom_event_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 // Padding amounts on the left/right of a custom menu item (like the browser
@@ skipping 66 matching lines @@
     [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)];
   }
 
   scoped_ptr<content::HostZoomMap::Subscription> subscription_;
 
   WrenchMenuController* controller_;  // Weak; owns this.
 
   DISALLOW_COPY_AND_ASSIGN(ZoomLevelObserver);
 };
 
+class ToolbarActionsBarObserverHelper : public ToolbarActionsBarObserver {
+ public:
+  ToolbarActionsBarObserverHelper(WrenchMenuController* controller,
+                                  ToolbarActionsBar* toolbar_actions_bar)
+      : controller_(controller),
+        scoped_observer_(this) {
+    scoped_observer_.Add(toolbar_actions_bar);
+  }
+  ~ToolbarActionsBarObserverHelper() override {}
+
+ private:
+  // ToolbarActionsBarObserver:
+  void OnToolbarActionsBarDestroyed() override {
+    scoped_observer_.RemoveAll();
+  }
+  void OnToolbarActionsBarDidStartResize() override {
+    [controller_ updateBrowserActionsSubmenu];
+  }
+
+  WrenchMenuController* controller_;
+  ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver> scoped_observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarObserverHelper);
+};
+
 }  // namespace WrenchMenuControllerInternal
 
 @implementation WrenchMenuController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super init])) {
     browser_ = browser;
-    observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver(
-        self,
-        ui_zoom::ZoomEventManager::GetForBrowserContext(browser->profile())));
     acceleratorDelegate_.reset(
         new WrenchMenuControllerInternal::AcceleratorDelegate());
     [self createModel];
   }
   return self;
 }
 
 - (void)dealloc {
   [self browserWillBeDestroyed];
   [super dealloc];
 }
 
 - (void)browserWillBeDestroyed {
   // This method indicates imminent destruction. Destroy owned objects that hold
   // a weak Browser*, or pass this call onto reference counted objects.
   recentTabsMenuModelDelegate_.reset();
   [self setModel:nullptr];
   wrenchMenuModel_.reset();
   buttonViewController_.reset();
-  // ZoomLevelObserver holds a subscription to ZoomEventManager, which is
-  // user-data on the BrowserContext. The BrowserContext may be destroyed soon
-  // if Chrome is quitting. In any case, |observer_| should not be needed at
-  // this point.
-  observer_.reset();
+
+  // The observers should most likely already be destroyed (since they're reset
+  // in -menuDidClose:), but sometimes shutdown can be funny, so make sure to
+  // not leave any dangling observers.
+  zoom_level_observer_.reset();
+  toolbar_actions_bar_observer_.reset();
 
   [browserActionsController_ browserWillBeDestroyed];
 
   browser_ = nullptr;
 }
 
 - (void)addItemToMenu:(NSMenu*)menu
               atIndex:(NSInteger)index
             fromModel:(ui::MenuModel*)model {
   // Non-button item types should be built as normal items, with the exception
@@ skipping 22 matching lines @@
       // a main counterpart, so if the browser window hasn't initialized, abort.
       // (This is fine because we re-populate the wrench menu each time before
       // we show it.)
       if (!browser_->window())
         break;
 
       BrowserActionsController* mainController =
           [[[BrowserWindowController browserWindowControllerForWindow:browser_->
               window()->GetNativeWindow()] toolbarController]
                   browserActionsController];
+      toolbar_actions_bar_observer_.reset(
+          new WrenchMenuControllerInternal::ToolbarActionsBarObserverHelper(
+              self, [mainController toolbarActionsBar]));
       browserActionsController_.reset(
           [[BrowserActionsController alloc]
               initWithBrowser:browser_
                 containerView:containerView
                mainController:mainController]);
       break;
     }
     case IDC_EDIT_MENU:
       view = [buttonViewController_ editItem];
       break;
@@ skipping 97 matching lines @@
   [browserActionsController_ update];
 
   [view setFrameOrigin:NSZeroPoint];
   [[containerView superview] setFrameOrigin:NSZeroPoint];
   [containerView setFrameOrigin:NSMakePoint(kLeftPadding, 0)];
 }
 
 - (void)menuWillOpen:(NSMenu*)menu {
   [super menuWillOpen:menu];
 
+  zoom_level_observer_.reset(
+      new WrenchMenuControllerInternal::ZoomLevelObserver(
+          self,
+          ui_zoom::ZoomEventManager::GetForBrowserContext(
+              browser_->profile())));
   NSString* title = base::SysUTF16ToNSString(
       [self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));
   [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]
       setTitle:title];
   content::RecordAction(UserMetricsAction("ShowAppMenu"));
 
   NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ?
       [NSImage imageNamed:NSImageNameExitFullScreenTemplate] :
           [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
   [[buttonViewController_ zoomFullScreen] setImage:icon];
 }
 
+- (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();
+}
+
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   // First empty out the menu and create a new model.
   [self removeAllItems:menu];
   [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];
@@ skipping 229 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 WrenchMenuButtonViewController