[Mac] First pass at multiple selection in the tabstrip.

chrome/browser/ui/cocoa/tabs/tab_view.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/tabs/tab_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 240 matching lines @@
   // don't have to worry about mouse ups.
   if (closeButtonActive && [controller_ inRapidClosureMode]) {
     NSPoint hitLocation = [[self superview] convertPoint:downLocation
                                                 fromView:nil];
     if ([self hitTest:hitLocation] == closeButton_) {
       [closeButton_ mouseDown:theEvent];
       return;
     }
   }
 
-  // Fire the action to select the tab.
-  if ([[controller_ target] respondsToSelector:[controller_ action]])
-    [[controller_ target] performSelector:[controller_ action]
-                               withObject:self];
-
   [self resetDragControllers];
 
   // Resolve overlay back to original window.
   sourceWindow_ = [self window];
   if ([sourceWindow_ isKindOfClass:[NSPanel class]]) {
     sourceWindow_ = [sourceWindow_ parentWindow];
   }
 
   sourceWindowFrame_ = [sourceWindow_ frame];
   sourceTabFrame_ = [self frame];
@@ skipping 263 matching lines @@
   // a placeholder so it appears like it's part of that window.
   if (targetController_) {
     if (![[targetController_ window] isKeyWindow]) {
       // && ([targetDwellDate timeIntervalSinceNow] < -REQUIRED_DWELL)) {
       [[targetController_ window] orderFront:nil];
       targetDwellDate = nil;
     }
 
     // Compute where placeholder should go and insert it into the
     // destination tab strip.
-    TabView* draggedTabView = (TabView*)[draggedController_ selectedTabView];
+    TabView* draggedTabView = (TabView*)[draggedController_ activeTabView];
     NSRect tabFrame = [draggedTabView frame];
     tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];
     tabFrame.origin = [[targetController_ window]
                         convertScreenToBase:tabFrame.origin];
     tabFrame = [[targetController_ tabStripView]
                 convertRect:tabFrame fromView:nil];
     [targetController_ insertPlaceholderForTab:self
                                          frame:tabFrame
                                  yStretchiness:0];
     [targetController_ layoutTabs];
   } else {
     [dragWindow_ makeKeyAndOrderFront:nil];
   }
 
   // Adjust the visibility of the window background. If there is a drop target,
   // we want to hide the window background so the tab stands out for
   // positioning. If not, we want to show it so it looks like a new window will
   // be realized.
   BOOL chromeShouldBeVisible = targetController_ == nil;
   [self setWindowBackgroundVisibility:chromeShouldBeVisible];
 }
 
 - (void)mouseUp:(NSEvent*)theEvent {
   // The drag/click is done. If the user dragged the mouse, finalize the drag
   // and clean up.
 
+  // Fire the action to select the tab.
+  if ([[controller_ target] respondsToSelector:[controller_ action]])
+    [[controller_ target] performSelector:[controller_ action]
+                               withObject:self];
+
   // Special-case this to keep the logic below simpler.
   if (moveWindowOnDrag_)
     return;
 
   // Cancel any delayed -mouseDragged: requests that may still be pending.
   [NSObject cancelPreviousPerformRequestsWithTarget:self];
 
   // TODO(pinkerton): http://crbug.com/25682 demonstrates a way to get here by
   // some weird circumstance that doesn't first go through mouseDown:. We
   // really shouldn't go any farther.
   if (!sourceController_)
     return;
 
   // We are now free to re-display the new tab button in the window we're
   // dragging. It will show when the next call to -layoutTabs (which happens
   // indrectly by several of the calls below, such as removing the placeholder).
   [draggedController_ showNewTabButton:YES];
 
   if (draggingWithinTabStrip_) {
     if (tabWasDragged_) {
       // Move tab to new location.
       DCHECK([sourceController_ numberOfTabs]);
       TabWindowController* dropController = sourceController_;
-      [dropController moveTabView:[dropController selectedTabView]
+      [dropController moveTabView:[dropController activeTabView]
                    fromController:nil];
     }
   } else if (targetController_) {
     // Move between windows. If |targetController_| is nil, we're not dropping
     // into any existing window.
-    NSView* draggedTabView = [draggedController_ selectedTabView];
+    NSView* draggedTabView = [draggedController_ activeTabView];
     [targetController_ moveTabView:draggedTabView
                     fromController:draggedController_];
     // Force redraw to avoid flashes of old content before returning to event
     // loop.
     [[targetController_ window] display];
     [targetController_ showWindow:nil];
     [draggedController_ removeOverlay];
   } else {
     // Only move the window around on screen. Make sure it's set back to
     // normal state (fully opaque, has shadow, has key, etc).
@@ skipping 152 matching lines @@
 
   // Draw the top stroke.
   [context saveGraphicsState];
   [borderColor set];
   [path setLineWidth:lineWidth];
   [path stroke];
   [context restoreGraphicsState];
 
   // Mimic the tab strip's bottom border, which consists of a dark border
   // and light highlight.
-  if (!selected) {
+  if (![controller_ active]) {
     [path addClip];
     NSRect borderRect = rect;
     borderRect.origin.y = lineWidth;
     borderRect.size.height = lineWidth;
     [borderColor set];
     NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
 
     borderRect.origin.y = 0;
     [highlightColor set];
     NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
@@ skipping 271 matching lines @@
                                  topRight.y)
        controlPoint2:NSMakePoint(bottomRight.x - baseControlPointOutset,
                                  bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + lineWidth, bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + lineWidth,
                                 bottomRight.y - (2 * lineWidth))];
   return path;
 }
 
 @end  // @implementation TabView(Private)