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

base/base_drag_source.h

Index: base/base_drag_source.h
===================================================================
--- base/base_drag_source.h	(revision 20694)
+++ base/base_drag_source.h	(working copy)
@@ -23,6 +23,13 @@
   BaseDragSource();
   virtual ~BaseDragSource() { }
 
+  // Stop the drag operation at the next chance we get.  This doesn't
+  // synchronously stop the drag (since Windows is controlling that),
+  // but lets us tell Windows to cancel the drag the next chance we get.
+  void CancelDrag() {
+    cancel_drag_ = true;
+  }
+
   // IDropSource implementation:
   HRESULT __stdcall QueryContinueDrag(BOOL escape_pressed, DWORD key_state);
   HRESULT __stdcall GiveFeedback(DWORD effect);
@@ -40,6 +47,9 @@
  private:
   LONG ref_count_;
 
+  // Set to true if we want to cancel the drag operation.
+  bool cancel_drag_;
+
   DISALLOW_EVIL_CONSTRUCTORS(BaseDragSource);
 };
 
Property changes on: base\base_drag_source.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/base/base_drag_source.h:r20436
   Merged /branches/chrome_webkit_merge_branch/base/base_drag_source.h:r69-2775