Mac: Eliminate unintended "menu" method overrides.

chrome/browser/cocoa/bookmark_bar_controller.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.
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
@@ skipping 89 matching lines @@
 
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
   [[self view] setPostsFrameChangedNotifications:YES];
   [[NSNotificationCenter defaultCenter]
     addObserver:self
        selector:@selector(frameDidChange)
            name:NSViewFrameDidChangeNotification
          object:[self view]];
 
-  DCHECK([offTheSideButton_ menu]);
+  DCHECK([offTheSideButton_ attachedMenu]);
 }
 
 - (void)showIfNeeded {
   if (profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
     [self showBookmarkBar:YES immediately:YES];
 }
 
 // Check if we should enable the off-the-side button.
 // TODO(jrg): when we are smarter about creating buttons (e.g. don't
 // bother creating buttons which aren't visible), we'll have to be
@@ skipping 206 matching lines @@
   for (NSButton* each_button in buttons_.get()) {
     if (NSMaxX([each_button frame]) >
         NSMaxX([[each_button superview] frame])) {
       [self addNode:[self nodeFromButton:each_button] toMenu:menu];
     }
   }
 }
 
 // Get the off-the-side menu.
 - (NSMenu*)offTheSideMenu {
-  return [offTheSideButton_ menu];
+  return [offTheSideButton_ attachedMenu];
 }
 
 // Called by any menus which have set us as their delegate (right now just the
 // off-the-side menu?).
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   if (menu == [self offTheSideMenu])
     [self buildOffTheSideMenu];
 }
 
 // As a convention we set the menu's delegate to be the button's cell
@@ skipping 338 matching lines @@
 
 - (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate {
   urlDelegate_ = urlDelegate;
 }
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 @end