Index: chrome/browser/tab_contents/tab_contents.cc |
=================================================================== |
--- chrome/browser/tab_contents/tab_contents.cc (revision 20694) |
+++ chrome/browser/tab_contents/tab_contents.cc (working copy) |
@@ -1883,6 +1883,13 @@ |
} |
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); |
Property changes on: chrome\browser\tab_contents\tab_contents.cc |
___________________________________________________________________ |
Modified: svn:mergeinfo |
Merged /trunk/src/chrome/browser/tab_contents/tab_contents.cc:r20436 |