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

Unified Diff: chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc

Issue 9562049: Move the core drag&drop code for Windows to content\browser to match Mac/GTK. I've had to add tempo… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
===================================================================
--- chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc (revision 124553)
+++ chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc (working copy)
@@ -16,13 +16,13 @@
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/tab_contents/web_drag_source_win.h"
-#include "chrome/browser/tab_contents/web_drag_utils_win.h"
-#include "chrome/browser/tab_contents/web_drop_target_win.h"
#include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h"
#include "chrome/common/url_constants.h"
#include "content/browser/download/drag_download_file.h"
#include "content/browser/download/drag_download_util.h"
+#include "content/browser/tab_contents/web_drag_dest_win.h"
+#include "content/browser/tab_contents/web_drag_source_win.h"
+#include "content/browser/tab_contents/web_drag_utils_win.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/web_contents.h"
@@ -133,8 +133,8 @@
}
// We do not want to drag and drop the download to itself.
- old_drop_target_suspended_state_ = view_->drop_target()->suspended();
- view_->drop_target()->set_suspended(true);
+ old_drop_target_suspended_state_ = view_->drag_dest()->suspended();
+ view_->drag_dest()->set_suspended(true);
// Start a background thread to do the drag-and-drop.
DCHECK(!drag_drop_thread_.get());
@@ -334,7 +334,7 @@
drag_ended_ = true;
if (restore_suspended_state)
- view_->drop_target()->set_suspended(old_drop_target_suspended_state_);
+ view_->drag_dest()->set_suspended(old_drop_target_suspended_state_);
if (msg_hook) {
AttachThreadInput(drag_out_thread_id, GetCurrentThreadId(), FALSE);
« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698