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

chrome/browser/cocoa/bookmark_bar_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.
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 342 matching lines @@
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     // Height takes into account the extra height we have since the toolbar
     // only compresses when we're done.
     [view animateToNewHeight:(bookmarks::kBookmarkBarHeight -
                               kBookmarkBarOverlap)
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:bookmarks::kShowingState
                                 toState:bookmarks::kHiddenState]) {
-    // The toolbar uncompresses immediately at the beginning (otherwise the
-    // slide looks wrong, since we slide into the bottom of stuff in the
-    // toolbar). Do this only if we're at the beginning height since we may
-    // enter this mid-animation.
-    if (NSHeight([[self view] frame]) == bookmarks::kBookmarkBarHeight) {
-      [resizeDelegate_ resizeView:[self view]
-                        newHeight:(bookmarks::kBookmarkBarHeight -
-                                      kBookmarkBarOverlap)];
-    }
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     [view animateToNewHeight:0
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:bookmarks::kShowingState
                                 toState:bookmarks::kDetachedState]) {
-    // The toolbar uncompresses immediately at the beginning (otherwise the
-    // slide looks wrong, since we slide into the bottom of stuff in the
-    // toolbar). Do this only if we're at the beginning height since we may
-    // enter this mid-animation.
-    if (NSHeight([[self view] frame]) == bookmarks::kBookmarkBarHeight) {
-      [resizeDelegate_ resizeView:[self view]
-                        newHeight:(bookmarks::kBookmarkBarHeight -
-                                      kBookmarkBarOverlap)];
-    }
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     [view animateToNewHeight:bookmarks::kNTPBookmarkBarHeight
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:bookmarks::kDetachedState
                                 toState:bookmarks::kShowingState]) {
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
@@ skipping 961 matching lines @@
         [[self animatableView] currentAnimationProgress]);
   }
   if ([self isAnimatingFromState:bookmarks::kDetachedState]) {
     return static_cast<CGFloat>(
         1 - [[self animatableView] currentAnimationProgress]);
   }
   return 0;
 }
 
 @end