mac: Refactor tab strip layout logic.

chrome/browser/ui/cocoa/browser_window_controller_private.h

 // Copyright (c) 2012 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_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 
 @class BrowserWindowLayout;
 
 // Private methods for the |BrowserWindowController|. This category should
 // contain the private methods used by different parts of the BWC; private
 // methods used only by single parts should be declared in their own file.
 // TODO(viettrungluu): [crbug.com/35543] work on splitting out stuff from the
 // BWC, and figuring out which methods belong here (need to unravel
 // "dependencies").
@@ skipping 14 matching lines @@
 
 // Repositions the window's subviews. From the top down: toolbar, normal
 // bookmark bar (if shown), infobar, NTP detached bookmark bar (if shown),
 // content area, download shelf (if any).
 - (void)layoutSubviews;
 
 // Shows the informational "how to exit fullscreen" bubble.
 - (void)showFullscreenExitBubbleIfNecessary;
 - (void)destroyFullscreenExitBubbleIfNecessary;
 
-// Lays out the tab strip at the given maximum y-coordinate, with the given
-// width, possibly for fullscreen mode; returns the new maximum y (below the
-// tab strip). This is safe to call even when there is no tab strip.
-- (CGFloat)layoutTabStripAtMaxY:(CGFloat)maxY
-                          width:(CGFloat)width
-                     fullscreen:(BOOL)fullscreen;
+// Lays out the tab strip and avatar button.
+- (void)applyTabStripLayout:(const chrome::TabStripLayout&)layout;
 
 // Returns YES if the bookmark bar should be placed below the infobar, NO
 // otherwise.
 - (BOOL)placeBookmarkBarBelowInfoBar;
 
 
 // Lays out the tab content area in the given frame. If the height changes,
 // sends a message to the renderer to resize.
 - (void)layoutTabContentArea:(NSRect)frame;
 
@@ skipping 97 matching lines @@
 // to prevent redraws.
 - (void)setContentViewSubviews:(NSArray*)subviews;
 
 // A hack required to get NSThemeFrame sub layers to order correctly. See
 // implementation for more details.
 - (void)updateSubviewZOrderHack;
 
 @end  // @interface BrowserWindowController(Private)
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_