Fix a bug where dragging a window that's been closed by JS back into another window would crash. Be more specific about when the window will be closed/deleted during dragging in hopes of making future crashes a little more clear.

BUG=none
TEST=dragging tabs between windows should work. tabs closed via window.close() on a timer should work.
Review URL: http://codereview.chromium.org/246035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27606 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index 6e741da..f44a482 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -491,12 +491,14 @@ static const CGFloat kRapidCloseDist = 2.5;
     [targetController_ showWindow:nil];
   } else {
     // Tab dragging did move window only.
-    [dragWindow_ setAlphaValue:1.0];
-    [dragOverlay_ setHasShadow:NO];
-    [dragWindow_ setHasShadow:YES];
     [draggedController_ removeOverlay];
-    [dragWindow_ makeKeyAndOrderFront:nil];
-
+    // Don't want to re-show the window if it was closed during the drag.
+    if ([dragWindow_ isVisible]) {
+      [dragWindow_ setAlphaValue:1.0];
+      [dragOverlay_ setHasShadow:NO];
+      [dragWindow_ setHasShadow:YES];
+      [dragWindow_ makeKeyAndOrderFront:nil];
+    }
     [[draggedController_ window] setLevel:NSNormalWindowLevel];
     [draggedController_ removePlaceholder];
   }