Merge 20436 - Fix a crash that happens if a tab is closed while...

chrome/browser/tab_contents/tab_contents.cc

 // 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 "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 1865 matching lines @@
     }
   }
 }
 
 void TabContents::UpdateInspectorSettings(const std::wstring& raw_settings) {
   profile()->GetPrefs()->SetString(prefs::kWebKitInspectorSettings,
                                    raw_settings);
 }
 
 void TabContents::Close(RenderViewHost* rvh) {
+  // If we close the tab while we're in the middle of a drag, we'll crash.
+  // Instead, cancel the drag and close it as soon as the drag ends.
+  if (view()->IsDoingDrag()) {
+    view()->CancelDragAndCloseTab();
+    return;
+  }
+
   // Ignore this if it comes from a RenderViewHost that we aren't showing.
   if (delegate() && rvh == render_view_host())
     delegate()->CloseContents(this);
 }
 
 void TabContents::RequestMove(const gfx::Rect& new_bounds) {
   if (delegate() && delegate()->IsPopup(this))
     delegate()->MoveContents(this, new_bounds);
 }
 
@@ skipping 454 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }