Fix issue where cmd-w was hard-coded to closing a browser tab regardless of t...

chrome/browser/cocoa/tab_strip_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.
 
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_cell.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/throbber_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "grit/generated_resources.h"
 
+NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
+
 // A simple view class that prevents the windowserver from dragging the
 // area behind tabs. Sometimes core animation confuses it.
 @interface TabStripControllerDragBlockingView : NSView
 @end
 @implementation TabStripControllerDragBlockingView
 - (BOOL)mouseDownCanMoveWindow {return NO;}
 - (void)drawRect:(NSRect)rect {}
 @end
 
 @implementation TabStripController
@@ skipping 295 matching lines @@
             positioned:inForeground ? NSWindowAbove : NSWindowBelow
             relativeTo:nil];
 
   [self setTabTitle:newController withContents:contents];
 
   // We don't need to call |-layoutTabs| if the tab will be in the foreground
   // because it will get called when the new tab is selected by the tab model.
   if (!inForeground) {
     [self layoutTabs];
   }
+  
+  // Send a broadcast that the number of tabs have changed.
+  [[NSNotificationCenter defaultCenter]
+      postNotificationName:kTabStripNumberOfTabsChanged
+                    object:self];
 }
 
 // Called when a notification is received from the model to select a particular
 // tab. Swaps in the toolbar and content area associated with |newContents|.
 - (void)selectTabWithContents:(TabContents*)newContents
              previousContents:(TabContents*)oldContents
                       atIndex:(NSInteger)index
                   userGesture:(bool)wasUserGesture {
   // De-select all other tabs and select the new tab.
   int i = 0;
@@ skipping 40 matching lines @@
   // Remove the |index|th view from the tab strip
   NSView* tab = [self viewAtIndex:index];
   [tab removeFromSuperview];
 
   NSValue *identifier = [NSValue valueWithPointer:tab];
   [targetFrames_ removeObjectForKey:identifier];
 
   // Once we're totally done with the tab, delete its controller
   [tabArray_ removeObjectAtIndex:index];
 
+  // Send a broadcast that the number of tabs have changed.
+  [[NSNotificationCenter defaultCenter]
+      postNotificationName:kTabStripNumberOfTabsChanged
+                    object:self];
+
   [self layoutTabs];
 }
 
 // A helper routine for creating an NSImageView to hold the fav icon for
 // |contents|.
 // TODO(pinkerton): fill in with code to use the real favicon, not the default
 // for all cases.
 - (NSImageView*)favIconImageViewForContents:(TabContents*)contents {
   NSRect iconFrame = NSMakeRect(0, 0, 16, 16);
   NSImageView* view = [[[NSImageView alloc] initWithFrame:iconFrame]
@@ skipping 132 matching lines @@
     selectedIndex = 0;
   }
   TabContentsController* selectedController =
       [tabContentsArray_ objectAtIndex:selectedIndex];
   if (!selectedController)
     return NSZeroRect;
   return [selectedController growBoxRect];
 }
 
 @end