From f8d172cbaeb8cd49be95b5581473805989e89ca6 Mon Sep 17 00:00:00 2001
From: "pinkerton@chromium.org"
 <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 11 Nov 2009 22:55:42 +0000
Subject: 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
---
 chrome/browser/cocoa/tab_strip_controller.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chrome/browser')

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 {
-- 
cgit v1.1