[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 83 matching lines @@
 
 - (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.
 - (void)internalSetSelected:(BOOL)selected {

[Avi (use Gerrit), 2011/04/08 15:22:20]

I'm a little fuzzy on what this function is supposed to do. Both setActive and
setSelected call through to this. If we're setting a tab to "selected !active",
is it still appropriate to do all these things, like cancel alerts?

[Robert Sesek, 2011/04/09 14:23:07]

The only thing that may not be appropriate is canceling alerts, but we still
need to update the visibility (to make tabs slightly bigger if we've got tiny
tabs) and to update the title color.

-  selected_ = selected;
   TabView* tabView = static_cast<TabView*>([self view]);
   DCHECK([tabView isKindOfClass:[TabView class]]);
   [tabView setState:selected];
   [tabView cancelAlert];
   [self updateVisibility];
   [self updateTitleColor];
 }
 
 // Called when the tab's nib is done loading and all outlets are hooked up.
 - (void)awakeFromNib {
@@ skipping 12 matching lines @@
 
   [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