Reverting 24700.

chrome/browser/cocoa/tab_strip_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
@@ skipping 54 matching lines @@
   NSRect newTabTargetFrame_;
   // If YES, do not show the new tab button during layout.
   BOOL forceNewTabButtonHidden_;
 
   // Width available for resizing the tabs (doesn't include the new tab
   // button). Used to restrict the available width when closing many tabs at
   // once to prevent them from resizing to fit the full width. If the entire
   // width should be used, this will have a value of |kUseFullAvailableWidth|.
   float availableResizeWidth_;
   // A tracking area that's the size of the tab strip used to be notified
-  // when the mouse moves in the tab strip
-  scoped_nsobject<NSTrackingArea> trackingArea_;
-  TabView* hoveredTab_;  // weak. Tab that the mouse is hovering over
+  // when the mouse leaves the tab strip. It's installed when the user clicks
+  // the close box of a tab and is removed when they move the mouse outside
+  // of the strip. When they do, we resize the tabs to use all available
+  // space.
+  scoped_nsobject<NSTrackingArea> closeTabTrackingArea_;
 
   // Array of subviews which are permanent (and which should never be removed),
   // such as the new-tab button, but *not* the tabs themselves.
   scoped_nsobject<NSMutableArray> permanentSubviews_;
 
   // Manages per-tab sheets.
   scoped_nsobject<GTMWindowSheetController> sheetController_;
 }
 
 // Initialize the controller with a view and browser that contains
@@ skipping 32 matching lines @@
                           frame:(NSRect)frame
                   yStretchiness:(CGFloat)yStretchiness;
 
 // Show or hide the new tab button. The button is hidden immediately, but
 // waits until the next call to |-layoutTabs| to show it again.
 - (void)showNewTabButton:(BOOL)show;
 
 // Force the tabs to rearrange themselves to reflect the current model.
 - (void)layoutTabs;
 
-// The user changed the theme, or theme state changed.
-- (void)applyTheme;
+// The user changed the theme.
+- (void)userChangedTheme;
 
 // Default height for tabs.
 + (CGFloat)defaultTabHeight;
 
 // Returns the (lazily created) window sheet controller of this window. Used
 // for the per-tab sheets.
 - (GTMWindowSheetController*)sheetController;
 
 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window;
 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window;
 
 @end
 
 // Notification sent when the number of tabs changes. The object will be this
 // controller.
 extern NSString* const kTabStripNumberOfTabsChanged;
 
 #endif  // CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_