Mac: Eliminate unintended "menu" method overrides.

chrome/browser/cocoa/menu_button.mm

 // Copyright (c) 2009 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/cocoa/menu_button.h"
 
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/clickhold_button_cell.h"
 
@@ skipping 27 matching lines @@
 }
 
 - (id)initWithFrame:(NSRect)frameRect {
   if ((self = [super initWithFrame:frameRect]))
     [self resetToDefaults];
   return self;
 }
 
 // Accessors and mutators:
 
-@synthesize menu = menu_;
+@synthesize attachedMenu = attachedMenu_;
 
 @end  // @implementation MenuButton
 
 @implementation MenuButton (Private)
 
 // Reset various settings of the button and its associated |ClickHoldButtonCell|
 // to the standard state which provides reasonable defaults.
 - (void)resetToDefaults {
   ClickHoldButtonCell* cell = [self cell];
   DCHECK([cell isKindOfClass:[ClickHoldButtonCell class]]);
   [cell setEnableClickHold:YES];
   [cell setClickHoldTimeout:0.0];       // Make menu trigger immediately.
   [cell setAction:@selector(clickShowMenu:)];
   [cell setTarget:self];
   [cell setClickHoldAction:@selector(dragShowMenu:)];
   [cell setClickHoldTarget:self];
 }
 
 // Actually show the menu (in the correct location). |isDragging| indicates
 // whether the mouse button is still down or not.
 - (void)showMenu:(BOOL)isDragging {
-  if (!menu_) {
+  if (![self attachedMenu]) {
     LOG(WARNING) << "No menu available.";
     if (isDragging) {
       // If we're dragging, wait for mouse up.
       [NSApp nextEventMatchingMask:NSLeftMouseUpMask
                          untilDate:[NSDate distantFuture]
                             inMode:NSEventTrackingRunLoopMode
                            dequeue:YES];
     }
     return;
   }
 
   // FIXME(viettrungluu): Silly fudge factors (same as in
   // delayedmenu_button.mm).
   NSRect frame = [self convertRect:[self frame]
                           fromView:[self superview]];
   frame.origin.x -= 2.0;
   frame.size.height += 10.0;
 
   // Make our pop-up button cell and set things up. This is, as of 10.5, the
   // official Apple-recommended hack. Later, perhaps |-[NSMenu
   // popUpMenuPositioningItem:atLocation:inView:]| may be a better option.
   // However, using a pulldown has the benefit that Cocoa automatically places
   // the menu correctly even when we're at the edge of the screen (including
   // "dragging upwards" when the button is close to the bottom of the screen).
   scoped_nsobject<NSPopUpButtonCell> popUpCell(
       [[NSPopUpButtonCell alloc] initTextCell:@""
                                     pullsDown:YES]);
   DCHECK(popUpCell.get());
-  [popUpCell setMenu:menu_];
+  [popUpCell setMenu:[self attachedMenu]];
   [popUpCell selectItem:nil];
   [popUpCell attachPopUpWithFrame:frame
                            inView:self];
   [popUpCell performClickWithFrame:frame
                             inView:self];
 }
 
 // Called when the button is clicked and released. (Shouldn't happen with
 // timeout of 0, though there may be some strange pointing devices out there.)
 - (void)clickShowMenu:(id)sender {
   [self showMenu:NO];
 }
 
 // Called when the button is clicked and dragged/held.
 - (void)dragShowMenu:(id)sender {
   [self showMenu:YES];
 }
 
 @end  // @implementation MenuButton (Private)