| Index: chrome/browser/cocoa/tab_strip_controller.h
|
| ===================================================================
|
| --- chrome/browser/cocoa/tab_strip_controller.h (revision 24798)
|
| +++ chrome/browser/cocoa/tab_strip_controller.h (working copy)
|
| @@ -38,7 +38,7 @@
|
| GTMWindowSheetControllerDelegate> {
|
| @private
|
| TabContents* currentTab_; // weak, tab for which we're showing state
|
| - TabStripView* tabView_; // weak
|
| + scoped_nsobject<TabStripView> tabView_; // strong
|
| NSView* switchView_; // weak
|
| scoped_nsobject<NSView> dragBlockingView_; // avoid bad window server drags
|
| NSButton* newTabButton_; // weak, obtained from the nib.
|
| @@ -72,11 +72,9 @@
|
| // 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 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_;
|
| + // when the mouse moves in the tab strip
|
| + scoped_nsobject<NSTrackingArea> trackingArea_;
|
| + TabView* hoveredTab_; // weak. Tab that the mouse is hovering over
|
|
|
| // Array of subviews which are permanent (and which should never be removed),
|
| // such as the new-tab button, but *not* the tabs themselves.
|
| @@ -129,8 +127,8 @@
|
| // Force the tabs to rearrange themselves to reflect the current model.
|
| - (void)layoutTabs;
|
|
|
| -// The user changed the theme.
|
| -- (void)userChangedTheme;
|
| +// The user changed the theme, or theme state changed.
|
| +- (void)applyTheme;
|
|
|
| // Default height for tabs.
|
| + (CGFloat)defaultTabHeight;
|
|
|