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

chrome/browser/tab_contents/tab_contents_view.h

Index: chrome/browser/tab_contents/tab_contents_view.h
===================================================================
--- chrome/browser/tab_contents/tab_contents_view.h	(revision 20694)
+++ chrome/browser/tab_contents/tab_contents_view.h	(working copy)
@@ -138,6 +138,14 @@
     return preferred_width_;
   }
 
+  // If we try to close the tab while a drag is in progress, we crash.  These
+  // methods allow the tab contents to determine if a drag is in progress and
+  // postpone the tab closing.
+  virtual bool IsDoingDrag() const {
+    return false;
+  }
+  virtual void CancelDragAndCloseTab() {}
+
  protected:
   TabContentsView() {}  // Abstract interface.
 
Property changes on: chrome\browser\tab_contents\tab_contents_view.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/tab_contents/tab_contents_view.h:r20436