mac: Refactor browser_window_controller layout logic.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
+#import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
@@ skipping 909 matching lines @@
 - (void)resizeView:(NSView*)view newHeight:(CGFloat)height {
   // We should only ever be called for one of the following four views.
   // |downloadShelfController_| may be nil. If we are asked to size the bookmark
   // bar directly, its superview must be this controller's content view.
   DCHECK(view);
   DCHECK(view == [toolbarController_ view] ||
          view == [infoBarContainerController_ view] ||
          view == [downloadShelfController_ view] ||
          view == [bookmarkBarController_ view]);
 
+  // The infobar has insufficient information to determine its new height. It
+  // knows the total height of all of the info bars (which is what it passes
+  // into this method), but knows nothing about the maximum arrow height, which
+  // is determined by this class.
+  if (view == [infoBarContainerController_ view]) {
+    base::scoped_nsobject<BrowserWindowLayout> layout(
+        [[BrowserWindowLayout alloc] init]);
+    [self updateLayoutParameters:layout];
+    // Use the new height for the info bar.
+    [layout setInfoBarHeight:height];
+
+    chrome::LayoutOutput output = [layout computeLayout];
+
+    height = NSHeight(output.infoBarFrame);
+  }
+
   // Change the height of the view and call |-layoutSubViews|. We set the height
   // here without regard to where the view is on the screen or whether it needs
   // to "grow up" or "grow down."  The below call to |-layoutSubviews| will
   // position each view correctly.
   NSRect frame = [view frame];
   if (NSHeight(frame) == height)
     return;
 
   // Disable screen updates to prevent flickering.
   gfx::ScopedNSDisableScreenUpdates disabler;
@@ skipping 566 matching lines @@
 
 - (DevToolsController*)devToolsController {
   return devToolsController_;
 }
 
 - (BOOL)isDownloadShelfVisible {
   return downloadShelfController_ != nil &&
       [downloadShelfController_ isVisible];
 }
 
-- (DownloadShelfController*)downloadShelf {
+- (void)createAndAddDownloadShelf {
   if (!downloadShelfController_.get()) {
     downloadShelfController_.reset([[DownloadShelfController alloc]
         initWithBrowser:browser_.get() resizeDelegate:self]);
     [[[self window] contentView] addSubview:[downloadShelfController_ view]];
   }
+}
+
+- (DownloadShelfController*)downloadShelf {
   return downloadShelfController_;
 }
 
 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController {
   // Shouldn't call addFindBar twice.
   DCHECK(!findBarCocoaController_.get());
 
   // Create a controller for the findbar.
   findBarCocoaController_.reset([findBarCocoaController retain]);
   [self layoutSubviews];
-  [self updateSubviewZOrder:[self isInFullscreenWithOmniboxSliding]];
+  [self updateSubviewZOrder];
 }
 
 - (NSWindow*)createFullscreenWindow {
   return [[[FullscreenWindow alloc] initForScreen:[[self window] screen]]
            autorelease];
 }
 
 - (NSInteger)numberOfTabs {
   // count() includes pinned tabs.
   return browser_->tab_strip_model()->count();
@@ skipping 614 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)