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

Unified Diff: app/os_exchange_data_provider_win.cc

Issue 1619023: Fix 2 drag-out problems:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 8 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 | « no previous file | chrome/browser/views/tab_contents/tab_contents_drag_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/os_exchange_data_provider_win.cc
===================================================================
--- app/os_exchange_data_provider_win.cc (revision 44662)
+++ app/os_exchange_data_provider_win.cc (working copy)
@@ -633,24 +633,25 @@
}
}
- if (wait_for_data) {
- // Notify the observer we start waiting for the data. This gives
- // an observer a chance to end the drag and drop.
- if (observer_)
- observer_->OnWaitForData();
+ if (!wait_for_data)
+ return DV_E_FORMATETC;
- // Now we can start the download.
- if ((*iter)->downloader.get()) {
- if (!(*iter)->downloader->Start(this)) {
- is_aborting_ = true;
- return DV_E_FORMATETC;
- }
+ // Notify the observer we start waiting for the data. This gives
+ // an observer a chance to end the drag and drop.
+ if (observer_)
+ observer_->OnWaitForData();
+
+ // Now we can start the download.
+ if ((*iter)->downloader.get()) {
+ if (!(*iter)->downloader->Start(this)) {
+ is_aborting_ = true;
+ return DV_E_FORMATETC;
}
+ }
- // The stored data should have been updated with the final version.
- // So we just need to call this function again to retrieve it.
- return GetData(format_etc, medium);
- }
+ // The stored data should have been updated with the final version.
+ // So we just need to call this function again to retrieve it.
+ return GetData(format_etc, medium);
}
return S_OK;
}
« no previous file with comments | « no previous file | chrome/browser/views/tab_contents/tab_contents_drag_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698