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

chrome/browser/ui/cocoa/tabs/tab_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.
 
 #include "base/mac/mac_util.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
@@ skipping 80 matching lines @@
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [[self tabView] setController:nil];
   [super dealloc];
 }
 
-// The internals of |-setSelected:| but doesn't check if we're already set
-// to |selected|. Pass the selection change to the subviews that need it and
-// mark ourselves as needing a redraw.
+// The internals of |-setSelected:| and |-setActive:| but doesn't set the
+// backing variables. This updates the drawing state and marks self as needing
+// a re-draw.
 - (void)internalSetSelected:(BOOL)selected {
-  selected_ = selected;
   TabView* tabView = static_cast<TabView*>([self view]);
   DCHECK([tabView isKindOfClass:[TabView class]]);
   [tabView setState:selected];
-  [tabView cancelAlert];
+  if ([self active])
+    [tabView cancelAlert];
   [self updateVisibility];
   [self updateTitleColor];
 }
 
 // Called when the tab's nib is done loading and all outlets are hooked up.
 - (void)awakeFromNib {
   // Remember the icon's frame, so that if the icon is ever removed, a new
   // one can later replace it in the proper location.
   originalIconFrame_ = [iconView_ frame];
 
   // When the icon is removed, the title expands to the left to fill the space
   // left by the icon.  When the close button is removed, the title expands to
   // the right to fill its space.  These are the amounts to expand and contract
   // titleView_ under those conditions. We don't have to explicilty save the
   // offset between the title and the close button since we can just get that
   // value for the close button's frame.
   NSRect titleFrame = [titleView_ frame];
   iconTitleXOffset_ = NSMinX(titleFrame) - NSMinX(originalIconFrame_);
 
   [self internalSetSelected:selected_];
 }
 
 // Called when Cocoa wants to display the context menu. Lazily instantiate
 // the menu based off of the cross-platform model. Re-create the menu and
 // model every time to get the correct labels and enabling.
 - (NSMenu*)menu {
   contextMenuDelegate_.reset(
       new TabControllerInternal::MenuDelegate(target_, self));
-  contextMenuModel_.reset(new TabMenuModel(contextMenuDelegate_.get(),
-                                           [self pinned]));
+  contextMenuModel_.reset(
+      [target_ contextMenuModelForController:self
+                                menuDelegate:contextMenuDelegate_.get()]);
   contextMenuController_.reset(
       [[MenuController alloc] initWithModel:contextMenuModel_.get()
                      useWithPopUpButtonCell:NO]);
   return [contextMenuController_ menu];
 }
 
 - (IBAction)closeTab:(id)sender {
   if ([[self target] respondsToSelector:@selector(closeTab:)]) {
     [[self target] performSelector:@selector(closeTab:)
                         withObject:[self view]];
   }
 }
 
 - (void)setTitle:(NSString*)title {
   [[self view] setToolTip:title];
   if ([self mini] && ![self selected]) {
     TabView* tabView = static_cast<TabView*>([self view]);
     DCHECK([tabView isKindOfClass:[TabView class]]);
     [tabView startAlert];
   }
   [super setTitle:title];
 }
 
+- (void)setActive:(BOOL)active {
+  if (active != active_) {
+    active_ = active;
+    [self internalSetSelected:[self selected]];
+  }
+}
+
+- (BOOL)active {
+  return active_;
+}
+
 - (void)setSelected:(BOOL)selected {
-  if (selected_ != selected)
-    [self internalSetSelected:selected];
+  if (selected_ != selected) {
+    selected_ = selected;
+    [self internalSetSelected:[self selected]];
+  }
 }
 
 - (BOOL)selected {
-  return selected_;
+  return selected_ || active_;
 }
 
 - (void)setIconView:(NSView*)iconView {
   [iconView_ removeFromSuperview];
   iconView_ = iconView;
   if ([self app]) {
     NSRect appIconFrame = [iconView frame];
     appIconFrame.origin = originalIconFrame_.origin;
     // Center the icon.
     appIconFrame.origin.x = ([TabController appTabWidth] -
@@ skipping 130 matching lines @@
   DCHECK([[titleView_ cell] isKindOfClass:
       [GTMFadeTruncatingTextFieldCell class]]);
   GTMFadeTruncatingTextFieldCell* cell = [titleView_ cell];
   [cell setDesiredCharactersToTruncateFromHead:length -
       TitlePrefixMatcher::kCommonCharsToShow];
   [cell setTruncateMode:length > TitlePrefixMatcher::kMinElidingLength ?
       GTMFadeTruncatingHeadAndTail : GTMFadeTruncatingTail];
 }
 
 @end