mac: Refactor browser_window_controller 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/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").
 @interface BrowserWindowController(Private)
 
 // Create the appropriate tab strip controller based on whether or not side
 // tabs are enabled. Replaces the current controller.
 - (void)createTabStripController;
 
 // Saves the window's position in the local state preferences.
 - (void)saveWindowPositionIfNeeded;
 
 // We need to adjust where sheets come out of the window, as by default they
 // erupt from the omnibox, which is rather weird.
 - (NSRect)window:(NSWindow*)window
     willPositionSheet:(NSWindow*)sheet
             usingRect:(NSRect)defaultSheetRect;
 
 // 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;
 
-// Find the total height of the floating bar (in presentation mode). Safe to
-// call even when not in presentation mode.
-- (CGFloat)floatingBarHeight;
-
 // 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 toolbar (or just location bar for popups) at the given maximum
-// y-coordinate, with the given width; returns the new maximum y (below the
-// toolbar).
-- (CGFloat)layoutToolbarAtMinX:(CGFloat)minX
-                          maxY:(CGFloat)maxY
-                         width:(CGFloat)width;
-
 // Returns YES if the bookmark bar should be placed below the infobar, NO
 // otherwise.
 - (BOOL)placeBookmarkBarBelowInfoBar;
 
-// Lays out the bookmark bar at the given maximum y-coordinate, with the given
-// width; returns the new maximum y (below the bookmark bar). Note that one must
-// call it with the appropriate |maxY| which depends on whether or not the
-// bookmark bar is shown as the NTP bubble or not (use
-// |-placeBookmarkBarBelowInfoBar|).
-- (CGFloat)layoutBookmarkBarAtMinX:(CGFloat)minX
-                              maxY:(CGFloat)maxY
-                             width:(CGFloat)width;
-
-// Lay out the view which draws the background for the floating bar when in
-// presentation mode, with the given frame and presentation-mode-status. Should
-// be called even when not in presentation mode to hide the backing view.
-- (void)layoutFloatingBarBackingView:(NSRect)frame
-                    presentationMode:(BOOL)presentationMode;
-
-// Lays out the infobar at the given maximum y-coordinate, with the given width;
-// returns the new maximum y (below the infobar).
-- (CGFloat)layoutInfoBarAtMinX:(CGFloat)minX
-                          maxY:(CGFloat)maxY
-                         width:(CGFloat)width;
-
-// Lays out the download shelf, if there is one, at the given minimum
-// y-coordinate, with the given width; returns the new minimum y (above the
-// download shelf). This is safe to call even if there is no download shelf.
-- (CGFloat)layoutDownloadShelfAtMinX:(CGFloat)minX
-                                minY:(CGFloat)minY
-                               width:(CGFloat)width;
 
 // 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;
 
 // Updates whether the bottom two corners are rounded.
 - (void)updateRoundedBottomCorners;
 
 // Sets the toolbar's height to a value appropriate for the given compression.
 // Also adjusts the bookmark bar's height by the opposite amount in order to
@@ skipping 30 matching lines @@
 - (void)enableBarVisibilityUpdates;
 - (void)disableBarVisibilityUpdates;
 
 // If there are no visibility locks and bar visibity updates are enabled, hides
 // the bar with |animation| and |delay|.  Otherwise, does nothing.
 - (void)hideOverlayIfPossibleWithAnimation:(BOOL)animation delay:(BOOL)delay;
 
 // The opacity for the toolbar divider; 0 means that it shouldn't be shown.
 - (CGFloat)toolbarDividerOpacity;
 
-// Ensures the z-order of subviews is correct.
-- (void)updateSubviewZOrder:(BOOL)inPresentationMode;
-
 // Update visibility of the infobar tip, depending on the state of the window.
 - (void)updateInfoBarTipVisibility;
 
-// Returns the max top arrow height for infobar.
-- (NSInteger)infoBarMaxTopArrowHeight;
+// The min Y of the bubble point, relative to the toolbar.

[Robert Sesek, 2014/09/12 15:40:00]

In what coordinate space?

[erikchen, 2014/09/12 17:26:14]

updated comment

+- (NSInteger)pageInfoBubblePointY;
 
 // Configures the presentationModeController_ right after it is constructed.
 - (void)configurePresentationModeController;
 
 // Allows the omnibox to slide. Also prepares UI for several fullscreen modes.
 // This method gets called when entering AppKit fullscren, or when entering
 // Immersive fullscreen. Expects fullscreenStyle_ to be set.
 - (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style;
 
 // This method gets called when exiting AppKit fullscreen, or when exiting
 // Immersive fullscreen. It performs some common UI changes, and stops the
 // omnibox from sliding.
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding;
 
 // Exposed for testing.
 // Creates a PresentationModeController with the given style.
 - (PresentationModeController*)newPresentationModeControllerWithStyle:
     (fullscreen_mac::SlidingStyle)style;
 
 // Toggles the AppKit Fullscreen API. By default, doing so enters Canonical
 // Fullscreen.
 - (void)enterAppKitFullscreen;
 - (void)exitAppKitFullscreen;
 
+// Updates |layout| with the full set of parameters required to statelessly
+// determine the layout of the views managed by this controller.
+- (void)updateLayoutParameters:(BrowserWindowLayout*)layout;
+
+// Applies a layout to the views managed by this controller.
+- (void)applyLayout:(BrowserWindowLayout*)layout;
+
+// Ensures that the window's content view's subviews have the correct
+// z-ordering. Will add or remove subviews as necessary.
+- (void)updateSubviewZOrder;
+
+// Performs updateSubviewZOrder when this controller is not in fullscreen.
+- (void)updateSubviewZOrderNormal;
+
+// Performs updateSubviewZOrder when this controller is in fullscreen.
+- (void)updateSubviewZOrderFullscreen;
+
+// Sets the content view's subviews. Attempts to not touch the tabContentArea
+// 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_