Index: base/base_drop_target.cc |
=================================================================== |
--- base/base_drop_target.cc (revision 35459) |
+++ base/base_drop_target.cc (working copy) |
@@ -15,7 +15,7 @@ |
BaseDropTarget::BaseDropTarget(HWND hwnd) |
: hwnd_(hwnd), |
- suspend_(false), |
+ suspended_(false), |
ref_count_(0) { |
DCHECK(hwnd); |
HRESULT result = RegisterDragDrop(hwnd, this); |
@@ -50,7 +50,7 @@ |
} |
// You can't drag and drop within the same HWND. |
- if (suspend_) { |
+ if (suspended_) { |
*effect = DROPEFFECT_NONE; |
return S_OK; |
} |
@@ -73,7 +73,7 @@ |
if (drop_helper) |
drop_helper->DragOver(reinterpret_cast<POINT*>(&cursor_position), *effect); |
- if (suspend_) { |
+ if (suspended_) { |
*effect = DROPEFFECT_NONE; |
return S_OK; |
} |
@@ -89,6 +89,9 @@ |
if (drop_helper) |
drop_helper->DragLeave(); |
+ if (suspended_) |
+ return S_OK; |
+ |
OnDragLeave(current_data_object_); |
current_data_object_ = NULL; |
@@ -106,7 +109,7 @@ |
reinterpret_cast<POINT*>(&cursor_position), *effect); |
} |
- if (suspend_) { |
+ if (suspended_) { |
*effect = DROPEFFECT_NONE; |
return S_OK; |
} |