[Mac] Restore the old bookmark menus now that the experiment is over.

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_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/bookmarks/bookmark_menu_cocoa_controller.h"
 
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_BOOKMARK_MENU
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "content/browser/user_metrics.h"
 #include "ui/base/text/text_elider.h"
 
 namespace {
 
 // Menus more than this many pixels wide will get trimmed
 // TODO(jrg): ask UI dudes what a good value is.
 const NSUInteger kMaximumMenuPixelsWide = 300;
 
 }
 
 @implementation BookmarkMenuCocoaController
 
-@synthesize delegate = delegate_;
-
 + (NSString*)menuTitleForNode:(const BookmarkNode*)node {
   NSFont* nsfont = [NSFont menuBarFontOfSize:0];  // 0 means "default"
   gfx::Font font(base::SysNSStringToUTF16([nsfont fontName]),
                  static_cast<int>([nsfont pointSize]));
   string16 title = ui::ElideText(node->GetTitle(),
                                  font,
                                  kMaximumMenuPixelsWide,
                                  false);
   return base::SysUTF16ToNSString(title);
 }
@@ skipping 28 matching lines @@
 
 - (NSMenu*)menu {
   return menu_;
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
   AppController* controller = [NSApp delegate];
   return [controller keyWindowIsNotModal];
 }
 
-// NSMenuDelegate //////////////////////////////////////////////////////////////
-
 // NSMenu delegate method: called just before menu is displayed.
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   bridge_->UpdateMenu(menu);
 }
 
-- (void)menuWillOpen:(NSMenu*)menu {
-  if ([delegate_ respondsToSelector:@selector(bookmarkMenuWillOpen:)])
-    [delegate_ bookmarkMenuWillOpen:self];
-}
-
-- (void)menuDidClose:(NSMenu*)menu {
-  if ([delegate_ respondsToSelector:@selector(bookmarkMenuDidClose:)])
-    [delegate_ bookmarkMenuDidClose:self];
-}
-
-// Private /////////////////////////////////////////////////////////////////////
-
 // Return the a BookmarkNode that has the given id (called
 // "identifier" here to avoid conflict with objc's concept of "id").
 - (const BookmarkNode*)nodeForIdentifier:(int)identifier {
   return bridge_->GetBookmarkModel()->GetNodeByID(identifier);
 }
 
 // Open the URL of the given BookmarkNode in the current tab.
 - (void)openURLForNode:(const BookmarkNode*)node {
   Browser* browser = Browser::GetTabbedBrowser(bridge_->GetProfile(), true);
   if (!browser)
@@ skipping 50 matching lines @@
 
 - (IBAction)openAllBookmarksNewWindow:(id)sender {
   [self openAll:[sender tag] withDisposition:NEW_WINDOW];
 }
 
 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
   [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
 }
 
 @end  // BookmarkMenuCocoaController