Merge 32560 - [Mac] Add support for growing or shrinking the window during an...

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 "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
@@ skipping 499 matching lines @@
   NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
   [locationBar_ setFrame:locationFrame];
 }
 
 - (NSRect)starButtonInWindowCoordinates {
   return [[[starButton_ window] contentView] convertRect:[starButton_ bounds]
                                                 fromView:starButton_];
 }
 
-- (void)setHeightCompression:(CGFloat)compressByHeight {
-  // Resize.
-  CGFloat newToolbarHeight = kBaseToolbarHeight - compressByHeight;
-  [resizeDelegate_ resizeView:[self view] newHeight:newToolbarHeight];
+- (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
+  return  kBaseToolbarHeight - compressByHeight;
 }
 
 - (void)setDividerOpacity:(CGFloat)opacity {
   BackgroundGradientView* view = [self backgroundGradientView];
   [view setShowsDivider:(opacity > 0 ? YES : NO)];
 
   // We may not have a toolbar view (e.g., popup windows only have a location
   // bar).
   if ([view isKindOfClass:[ToolbarView class]]) {
     ToolbarView* toolbarView = (ToolbarView*)view;
@@ skipping 69 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end