Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Unified Diff: base/base_drop_target.cc

Issue 351029: Support dragging a virtual file out of the browser. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base_drop_target.h ('k') | base/file_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « base/base_drop_target.h ('k') | base/file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698