| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 6b75c91eb239f4f4f1eaf70b76b0c233298a3f86..7d9b819b15d75392d4b96788d6d4d79e4f88a491 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -2814,9 +2814,6 @@ void WebContentsImpl::Close(RenderViewHost* rvh) {
|
| // mouse-down and mouse-up in text selection or a button click.
|
| // Defer the close until after tracking is complete, so that we
|
| // don't free objects out from under the UI.
|
| - // TODO(shess): This could probably be integrated with the
|
| - // IsDoingDrag() test below. Punting for now because I need more
|
| - // research to understand how this impacts platforms other than Mac.
|
| // TODO(shess): This could get more fine-grained. For instance,
|
| // closing a tab in another window while selecting text in the
|
| // current window's Omnibox should be just fine.
|
| @@ -2825,13 +2822,6 @@ void WebContentsImpl::Close(RenderViewHost* rvh) {
|
| return;
|
| }
|
|
|
| - // 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 (GetView()->IsDoingDrag()) {
|
| - GetView()->CancelDragAndCloseTab();
|
| - return;
|
| - }
|
| -
|
| // Ignore this if it comes from a RenderViewHost that we aren't showing.
|
| if (delegate_ && rvh == GetRenderViewHost())
|
| delegate_->CloseContents(this);
|
|
|