Rewrites the Mac view resizing logic to have the BrowserWindowController...

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2009 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/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
 // Name of image in the bundle for the yellow of the star icon.
 static NSString* const kStarredImageName = @"starred.pdf";
 
+// Height of the toolbar in pixels when the bookmark bar is closed.
+static const float kBaseToolbarHeight = 39.0;
+
+// Overlap (in pixels) between the toolbar and the bookmark bar.
+static const float kBookmarkBarOverlap = 5.0;
+
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
 @end
 
 namespace ToolbarControllerInternal {
 
 // A C++ class registered for changes in preferences. Bridges the
 // notification back to the ToolbarController.
 class PrefObserverBridge : public NotificationObserver {
@@ skipping 11 matching lines @@
   ToolbarController* controller_;  // weak, owns us
 };
 
 }  // namespace
 
 @implementation ToolbarController
 
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
-     webContentView:(NSView*)webContentView
-       infoBarsView:(NSView*)infoBarsView
+     resizeDelegate:(id<ViewResizer>)resizeDelegate
    bookmarkDelegate:(id<BookmarkURLOpener>)delegate {
   DCHECK(model && commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:mac_util::MainAppBundle()])) {
     toolbarModel_ = model;
     commands_ = commands;
     profile_ = profile;
+    resizeDelegate_ = resizeDelegate;
     bookmarkBarDelegate_ = delegate;
-    webContentView_ = webContentView;
-    infoBarsView_ = infoBarsView;
     hasToolbar_ = YES;
 
     // Register for notifications about state changes for the toolbar buttons
     commandObserver_.reset(new CommandObserverBridge(self, commands));
     commandObserver_->ObserveCommand(IDC_BACK);
     commandObserver_->ObserveCommand(IDC_FORWARD);
     commandObserver_->ObserveCommand(IDC_RELOAD);
     commandObserver_->ObserveCommand(IDC_HOME);
     commandObserver_->ObserveCommand(IDC_STAR);
   }
@@ skipping 23 matching lines @@
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(prefs::kShowHomeButton, prefs, prefObserver_.get());
   showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs,
                               prefObserver_.get());
   [self showOptionalHomeButton];
   [self showOptionalPageWrenchButtons];
 
   // Create a sub-controller for the bookmark bar.
   bookmarkBarController_.reset([[BookmarkBarController alloc]
                                    initWithProfile:profile_
-                                        parentView:[self view]
-                                    webContentView:webContentView_
-                                      infoBarsView:infoBarsView_
-                                          delegate:bookmarkBarDelegate_]);
+                                      initialWidth:NSWidth([[self view] frame])
+                                    resizeDelegate:self
+                                       urlDelegate:bookmarkBarDelegate_]);
 
   // Add bookmark bar to the view hierarchy.  This also triggers the
   // nib load.  The bookmark bar is defined (in the nib) to be
   // bottom-aligned to it's parent view (among other things), so
   // position and resize properties don't need to be set.
   [[self view] addSubview:[bookmarkBarController_ view]];
 }
 
+- (void)resizeView:(NSView*)view newHeight:(float)height {
+  DCHECK(view == [bookmarkBarController_ view]);
+
+  // The bookmark bar is always rooted at the bottom of the toolbar view, with
+  // width equal to the toolbar's width.  The toolbar view is resized to
+  // accomodate the new bookmark bar height.
+  NSRect frame = NSMakeRect(0, 0, [[self view] bounds].size.width, height);
+  [view setFrame:frame];
+
+  float newToolbarHeight = kBaseToolbarHeight + height - kBookmarkBarOverlap;
+  if (newToolbarHeight < kBaseToolbarHeight)
+    newToolbarHeight = kBaseToolbarHeight;
+
+  [resizeDelegate_ resizeView:[self view] newHeight:newToolbarHeight];
+}
+
 - (LocationBar*)locationBar {
   return locationBarView_.get();
 }
 
 - (void)focusLocationBar {
   if (locationBarView_.get()) {
     locationBarView_->FocusLocation();
   }
 }
 
@@ skipping 186 matching lines @@
                    forView:pageButton_];
 }
 
 - (IBAction)showWrenchMenu:(id)sender {
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 @end