This changelist represents the necessary merger of two others:...

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 "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"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h"
 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
+#import "chrome/browser/cocoa/event_utils.h"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
-#import "chrome/common/cocoa_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "skia/ext/skia_utils_mac.h"
 
+// Specialization of NSButton that responds to middle-clicks. By default,
+// NSButton ignores them.
+@interface BookmarkButton : NSButton
+@end
+
+@implementation BookmarkButton
+- (void)otherMouseUp:(NSEvent*) event {
+  [self performClick:self];
+}
+@end
+
 @interface BookmarkBarController(Private)
 - (void)applyContentAreaOffset:(BOOL)apply immediately:(BOOL)immediately;
 - (void)showBookmarkBar:(BOOL)enable immediately:(BOOL)immediately;
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu;
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu;
 - (void)tagEmptyMenu:(NSMenu*)menu;
 - (void)clearMenuTagMap;
 @end
 
 namespace {
 
 // Our height, when opened.
 const int kBookmarkBarHeight = 30;
 
 // Magic numbers from Cole
 const CGFloat kDefaultBookmarkWidth = 150.0;
 const CGFloat kBookmarkVerticalPadding = 2.0;
 const CGFloat kBookmarkHorizontalPadding = 1.0;
-};
+
+}  // namespace
 
 @implementation BookmarkBarController
 
 - (id)initWithProfile:(Profile*)profile
          initialWidth:(float)initialWidth
        resizeDelegate:(id<ViewResizer>)resizeDelegate
           urlDelegate:(id<BookmarkURLOpener>)urlDelegate {
   if ((self = [super initWithNibName:@"BookmarkBar"
                               bundle:mac_util::MainAppBundle()])) {
     profile_ = profile;
@@ skipping 125 matching lines @@
 - (BookmarkNode*)nodeFromButton:(id)button {
   NSCell* cell = [button cell];
   BookmarkNode* node = static_cast<BookmarkNode*>(
       [[cell representedObject] pointerValue]);
   DCHECK(node);
   return node;
 }
 
 - (IBAction)openBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromButton:sender];
-  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
-      [[NSApp currentEvent] modifierFlags]);
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:disposition];
+  [urlDelegate_ openBookmarkURL:node->GetURL()
+                    disposition:event_utils::WindowOpenDispositionFromNSEvent(
+                        [NSApp currentEvent])];
 }
 
 // Given a NSMenuItem tag, return the appropriate bookmark node id.
 - (int64)nodeIdFromMenuTag:(int32)tag {
   return menuTagMap_[tag];
 }
 
 // Create and return a new tag for the given node id.
 - (int32)menuTagFromNodeId:(int64)menuid {
   int tag = seedId_++;
@@ skipping 292 matching lines @@
         each_frame.origin.x += delta;
         [each_button setFrame:each_frame];
       }
     }
   }
 }
 
 - (IBAction)openBookmarkMenuItem:(id)sender {
   int64 tag = [self nodeIdFromMenuTag:[sender tag]];
   const BookmarkNode* node = bookmarkModel_->GetNodeByID(tag);
-  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
-      [[NSApp currentEvent] modifierFlags]);
+  WindowOpenDisposition disposition =
+      event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   [urlDelegate_ openBookmarkURL:node->GetURL() disposition:disposition];
 }
 
 // Add all items from the given model to our bookmark bar.
 // TODO(jrg): lots of things!
 //  - bookmark folders (e.g. menu from the button)
 //  - button and menu on the right for when bookmarks don't all fit on the
 //    screen
 //  - ...
 //
 // TODO(jrg): write a "build bar" so there is a nice spot for things
 // like the contextual menu which is invoked when not over a
 // bookmark.  On Safari that menu has a "new folder" option.
 - (void)addNodesToBar:(const BookmarkNode*)node {
   int x_offset = 0;
   for (int i = 0; i < node->GetChildCount(); i++) {
     const BookmarkNode* child = node->GetChild(i);
 
     NSCell* cell = [self cellForBookmarkNode:child];
     NSRect frame = [self frameForBookmarkButtonFromCell:cell xOffset:&x_offset];
-    NSButton* button = [[[NSButton alloc] initWithFrame:frame]
+    NSButton* button = [[[BookmarkButton alloc] initWithFrame:frame]
                          autorelease];
     DCHECK(button);
     [buttons_ addObject:button];
 
     // [NSButton setCell:] warns to NOT use setCell: other than in the
     // initializer of a control.  However, we are using a basic
     // NSButton whose initializer does not take an NSCell as an
     // object.  To honor the assumed semantics, we do nothing with
     // NSButton between alloc/init and setCell:.
     [button setCell:cell];
@@ skipping 96 matching lines @@
 
 - (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate {
   urlDelegate_ = urlDelegate;
 }
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 @end