[Extensions Mac UI] Fix more bugs in the action overflow container

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/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 39 matching lines @@
 - (void)createModel;
 - (void)adjustPositioning;
 - (void)performCommandDispatch:(NSNumber*)tag;
 - (NSButton*)zoomDisplay;
 - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item;
 - (void)removeAllItems:(NSMenu*)menu;
 - (NSMenu*)recentTabsSubmenu;
 - (RecentTabsSubMenuModel*)recentTabsMenuModel;
 - (int)maxWidthForMenuModel:(ui::MenuModel*)model
                  modelIndex:(int)modelIndex;
+- (void)containerSuperviewFrameChanged:(NSNotification*)notification;
 @end
 
 namespace WrenchMenuControllerInternal {
 
 // A C++ delegate that handles the accelerators in the wrench menu.
 class AcceleratorDelegate : public ui::AcceleratorProvider {
  public:
   bool GetAcceleratorForCommandId(int command_id,
                                   ui::Accelerator* out_accelerator) override {
     AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance();
@@ skipping 181 matching lines @@
                              bookmarkMenu));
 }
 
 - (void)updateBrowserActionsSubmenu {
   MenuTrackedRootView* view =
       [buttonViewController_ toolbarActionsOverflowItem];
   BrowserActionsContainerView* containerView =
       [buttonViewController_ overflowActionsContainerView];
 
   // Find the preferred container size for the menu width.
-  int maxContainerWidth =
-      [[self menu] size].width - kLeftPadding - kRightPadding;
+  int menuWidth = [[self menu] size].width;
+  int maxContainerWidth = menuWidth - kLeftPadding - kRightPadding;
+  // Don't let the menu change sizes on us. (We lift this restriction every time
+  // the menu updates, so if something changes, this won't leave us with an
+  // awkward size.)
+  [[self menu] setMinimumWidth:menuWidth];
   gfx::Size preferredContainerSize =
       [browserActionsController_ sizeForOverflowWidth:maxContainerWidth];
 
   // Set the origins and preferred size for the container.
   // View hierarchy is as follows (from parent > child):
   // |view| > |anonymous view| > containerView. We have to set the origin
   // and size of each for it display properly.
   // The parent views each have a size of the full width of the menu, so we can
   // properly position the container.
-  NSSize parentSize =
-      NSMakeSize([[self menu] size].width, preferredContainerSize.height());
+  NSSize parentSize = NSMakeSize(menuWidth, preferredContainerSize.height());
   [view setFrameSize:parentSize];
   [[containerView superview] setFrameSize:parentSize];
 
   // The container view gets its preferred size.
   [containerView setFrameSize:NSMakeSize(preferredContainerSize.width(),
                                          preferredContainerSize.height())];
   [browserActionsController_ update];
 
   [view setFrameOrigin:NSZeroPoint];
   [[containerView superview] setFrameOrigin:NSZeroPoint];
@@ skipping 12 matching lines @@
   NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ?
       [NSImage imageNamed:NSImageNameExitFullScreenTemplate] :
           [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
   [[buttonViewController_ zoomFullScreen] setImage:icon];
 }
 
 - (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];
   [self removeAllItems:newMenu];
   for (NSMenuItem* item in itemArray) {
     [menu addItem:item];
   }
 
@@ skipping 58 matching lines @@
 - (void)createModel {
   DCHECK(browser_);
   recentTabsMenuModelDelegate_.reset();
   wrenchMenuModel_.reset(
       new WrenchMenuModel(acceleratorDelegate_.get(), browser_));
   [self setModel:wrenchMenuModel_.get()];
 
   buttonViewController_.reset(
       [[WrenchMenuButtonViewController alloc] initWithController:self]);
   [buttonViewController_ view];
+
+  // See comment in containerSuperviewFrameChanged:.
+  NSView* containerSuperview =
+      [[buttonViewController_ overflowActionsContainerView] superview];
+  [containerSuperview setPostsFrameChangedNotifications:YES];
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(containerSuperviewFrameChanged:)
+             name:NSViewFrameDidChangeNotification
+           object:containerSuperview];
 }
 
 // Fit the localized strings into the Cut/Copy/Paste control, then resize the
 // whole menu item accordingly.
 - (void)adjustPositioning {
   const CGFloat kButtonPadding = 12;
   CGFloat delta = 0;
 
   // Go through the three buttons from right-to-left, adjusting the size to fit
   // the localized strings while keeping them all aligned on their horizontal
@@ skipping 82 matching lines @@
 // menu.
 - (int)maxWidthForMenuModel:(ui::MenuModel*)model
                  modelIndex:(int)modelIndex {
   RecentTabsSubMenuModel* recentTabsMenuModel = [self recentTabsMenuModel];
   if (recentTabsMenuModel && recentTabsMenuModel == model) {
     return recentTabsMenuModel->GetMaxWidthForItemAtIndex(modelIndex);
   }
   return -1;
 }
 
+- (void)containerSuperviewFrameChanged:(NSNotification*)notification {
+  // AppKit menus were probably never designed with a view like the browser
+  // actions container in mind, and, as a result, we come across a few oddities.
+  // One of these is that the container's superview will, on some versions of
+  // OSX, change frame position sometime after the the menu begins tracking
+  // (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 =
+      [[buttonViewController_ overflowActionsContainerView] superview];
+  if (NSMinX([containerSuperview frame]) != 0)
+    [containerSuperview setFrameOrigin:NSZeroPoint];
+}
+
 @end  // @implementation WrenchMenuController
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @implementation WrenchMenuButtonViewController
 
 @synthesize editItem = editItem_;
 @synthesize editCut = editCut_;
 @synthesize editCopy = editCopy_;
 @synthesize editPaste = editPaste_;
@@ skipping 11 matching lines @@
     controller_ = controller;
   }
   return self;
 }
 
 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
   [controller_ dispatchWrenchMenuCommand:sender];
 }
 
 @end  // @implementation WrenchMenuButtonViewController