P2.1a.

chrome/browser/cocoa/hover_close_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/hover_close_button.h"
 
 #include "app/l10n_util.h"
 #include "base/nsimage_cache_mac.h"
+#import "chrome/browser/cocoa/tab_controller.h"
 #include "grit/generated_resources.h"
 
 namespace  {
 
 const NSString* kNormalImageString = @"close_bar.pdf";
 const NSString* kHoverImageString = @"close_bar_h.pdf";
 const NSString* kPressedImageString = @"close_bar_p.pdf";
 
 }
 
@@ skipping 30 matching lines @@
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   [self setImage:nsimage_cache::ImageNamed(kHoverImageString)];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setImage:nsimage_cache::ImageNamed(kNormalImageString)];
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
+  // controller_ is only set for close buttons in the tab strip.
+  if (controller_ && ![controller_ closeButtonActive]) {
+    [[controller_ view] mouseDown:theEvent];
+    return;
+  }
+
   // The hover button needs to hold onto itself here for a bit.  Otherwise,
   // it can be freed while |super mouseDown:| is in it's loop, and the
   // |checkImageState| call will crash.
   // http://crbug.com/28220
   scoped_nsobject<HoverCloseButton> myself([self retain]);
 
   [super mouseDown:theEvent];
   // We need to check the image state after the mouseDown event loop finishes.
   // It's possible that we won't get a mouseExited event if the button was
   // moved under the mouse during tab resize, instead of the mouse moving over
@@ skipping 40 matching lines @@
         kHoverImageString : kNormalImageString;
     NSImage* newImage = nsimage_cache::ImageNamed(name);
     NSImage* buttonImage = [self image];
     if (![buttonImage isEqual:newImage]) {
       [self setImage:newImage];
     }
   }
 }
 
 @end