mac: Refactor tab strip layout logic.

chrome/browser/ui/cocoa/browser_window_layout.h

 // Copyright 2014 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_LAYOUT_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_LAYOUT_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
@@ skipping 18 matching lines @@
   // details.
   fullscreen_mac::SlidingStyle slidingStyle;
   // The minY of the AppKit Menu Bar, relative to the top of the screen. Ranges
   // from 0 to -22. Only relevant in fullscreen mode.
   CGFloat menubarOffset;
   // The fraction of the sliding toolbar that is visible in fullscreenm mode.
   // Ranges from 0 to 1. Only relevant in fullscreen mode.
   CGFloat toolbarFraction;
 
   BOOL hasTabStrip;
+  // The frame of the fullscreen button. May be NSZeroRect if the fullscreen
+  // button doesn't exist.
+  NSRect fullscreenButtonFrame;
+  // Whether the avatar button should be shown.
+  BOOL shouldShowAvatar;
+  // Whether to use the new avatar button.
+  BOOL shouldUseNewAvatar;

[Robert Sesek, 2014/09/26 16:55:54]

Does shouldShowAvatar have to be YES for this to be YES?

[erikchen, 2014/09/26 17:39:05]

I've updated the comments to indicate that this parameter only needs to be
defined if shouldShowAvatar == YES.

+  // The size of the avatar button.

[Robert Sesek, 2014/09/26 16:55:54]

What is this if shouldShowAvatar is NO?

[erikchen, 2014/09/26 17:39:05]

ditto

+  NSSize avatarSize;
+  // The line width that will generate a 1 pixel wide line for the avatar's
+  // superview.
+  CGFloat avatarLineWidth;
 
   BOOL hasToolbar;
   BOOL hasLocationBar;
   CGFloat toolbarHeight;
 
   BOOL bookmarkBarHidden;
   // If the bookmark bar is not hidden, then the bookmark bar should either be
   // directly below the omnibox, or directly below the info bar. This parameter
   // selects between those 2 cases.
   BOOL placeBookmarkBarBelowInfoBar;
   CGFloat bookmarkBarHeight;
 
   // The height of the info bar, not including the top arrow.
   CGFloat infoBarHeight;
   // The distance from the bottom of the location icon to the bottom of the
   // toolbar.
   CGFloat pageInfoBubblePointY;
 
   BOOL hasDownloadShelf;
   CGFloat downloadShelfHeight;
 };
 
-// The output frames of the views managed by the BrowserWindowController.
+// The parameters required to lay out the tab strip and its components.
+struct TabStripLayout {
+  // The frame of the tab strip in window coordinates.
+  NSRect frame;
+  CGFloat leftIndent;

[Robert Sesek, 2014/09/26 16:55:54]

What are these idnenting?

[erikchen, 2014/09/26 17:39:05]

Added comments. The indent is for the controls of the TabStripController.

+  CGFloat rightIndent;
+  BOOL addWindowControls;

[Robert Sesek, 2014/09/26 16:55:54]

Comment.

[erikchen, 2014/09/26 17:39:05]

Done. "Whether the TabStripController needs to add custom traffic light
buttons."

+  // The frame of the avatar in window coordinates.
+  NSRect avatarFrame;
+};
+
+// The output frames of the views managed by the BrowserWindowController. All
+// frames are in the coordinate system of the window. The lower-left corner of
+// the contentView coincides with the lower-left corner of the window, so these
+// frames are also in the coordinate system of the contentView.
 struct LayoutOutput {
-  NSRect tabStripFrame;
+  TabStripLayout tabStripLayout;
   NSRect toolbarFrame;
   NSRect bookmarkFrame;
   NSRect fullscreenBackingBarFrame;
   CGFloat findBarMaxY;
   CGFloat fullscreenExitButtonMaxY;
   NSRect infoBarFrame;
   CGFloat infoBarMaxTopArrowHeight;
   NSRect downloadShelfFrame;
   NSRect contentAreaFrame;
 };
@@ skipping 33 matching lines @@
 - (void)setWindowSize:(NSSize)size;
 
 // Whether the controller is in any fullscreen mode. |inAnyFullscreen| should
 // be NO if the controller is in the process of entering fullscreen.
 - (void)setInAnyFullscreen:(BOOL)inAnyFullscreen;
 - (void)setFullscreenSlidingStyle:(fullscreen_mac::SlidingStyle)slidingStyle;
 - (void)setFullscreenMenubarOffset:(CGFloat)menubarOffset;
 - (void)setFullscreenToolbarFraction:(CGFloat)toolbarFraction;
 
 - (void)setHasTabStrip:(BOOL)hasTabStrip;
+- (void)setFullscreenButtonFrame:(NSRect)frame;
+- (void)setShouldShowAvatar:(BOOL)shouldShowAvatar;
+- (void)setShouldUseNewAvatar:(BOOL)shouldUseNewAvatar;
+- (void)setAvatarSize:(NSSize)avatarSize;
+- (void)setAvatarLineWidth:(BOOL)avatarLineWidth;
 
 - (void)setHasToolbar:(BOOL)hasToolbar;
 - (void)setHasLocationBar:(BOOL)hasLocationBar;
 - (void)setToolbarHeight:(CGFloat)toolbarHeight;
 
 - (void)setBookmarkBarHidden:(BOOL)bookmarkBarHidden;
 - (void)setPlaceBookmarkBarBelowInfoBar:(BOOL)placeBookmarkBarBelowInfoBar;
 - (void)setBookmarkBarHeight:(CGFloat)bookmarkBarHeight;
 
 // The height of the info bar, not including the top arrow.
 - (void)setInfoBarHeight:(CGFloat)infoBarHeight;
 // The min Y of the bubble point, relative to the toolbar.
 - (void)setPageInfoBubblePointY:(CGFloat)pageInfoBubblePointY;
 
 - (void)setHasDownloadShelf:(BOOL)hasDownloadShelf;
 - (void)setDownloadShelfHeight:(CGFloat)downloadShelfHeight;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_LAYOUT_H_