diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 22:42:01 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 22:42:01 +0000 |
| commit | 5ef3748a651d073bf12928e880a042bf450e1aa8 (patch) | |
| tree | 8d9fffc1833dac45307ea621243c3bf4d792f271 /chrome/browser/cocoa/bookmark_bar_controller.mm | |
| parent | 9604b6481dc8be92426d43fd665e587038d5cba3 (diff) | |
| download | chromium_src-5ef3748a651d073bf12928e880a042bf450e1aa8.zip chromium_src-5ef3748a651d073bf12928e880a042bf450e1aa8.tar.gz chromium_src-5ef3748a651d073bf12928e880a042bf450e1aa8.tar.bz2 | |
[Mac] Add support for growing or shrinking the window during animations.
BUG=http://crbug.com/14900
TEST=No visible impact, yet.
Review URL: http://codereview.chromium.org/391035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index 6f2806d..d1c9861 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -360,15 +360,6 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; 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]; @@ -376,15 +367,6 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; 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]; |