summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 22:55:42 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 22:55:42 +0000
commitf8d172cbaeb8cd49be95b5581473805989e89ca6 (patch)
tree2251d38760fcff6de86db892e27ddfd1fd66eb45 /chrome/browser/cocoa
parent245318d3814e9da0e5f997645f2660dbae21e491 (diff)
downloadchromium_src-f8d172cbaeb8cd49be95b5581473805989e89ca6.zip
chromium_src-f8d172cbaeb8cd49be95b5581473805989e89ca6.tar.gz
chromium_src-f8d172cbaeb8cd49be95b5581473805989e89ca6.tar.bz2
Prevent accidental animations if we haven't yet done a full layout. Stab in the dark at a fix for some crashes.
BUG=26979 TEST=dragging tabs over an existing window should still animate as the placeholder shifts around. Review URL: http://codereview.chromium.org/385048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/tab_strip_controller.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 72f3324..d6a03a0c 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -505,7 +505,7 @@ static const NSTimeInterval kAnimationDuration = 0.2;
placeholderTab_ = tab;
placeholderFrame_ = frame;
placeholderStretchiness_ = yStretchiness;
- [self layoutTabsWithAnimation:YES regenerateSubviews:NO];
+ [self layoutTabsWithAnimation:initialLayoutComplete_ regenerateSubviews:NO];
}
- (BOOL)isTabFullyVisible:(TabView*)tab {