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

Side by Side Diff: content/browser/web_contents/web_drag_dest_win.cc

Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_drag_dest_win.h" 5 #include "content/browser/web_contents/web_drag_dest_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 9
10 #include "base/win/win_util.h" 10 #include "base/win/win_util.h"
11 #include "content/browser/renderer_host/render_view_host_impl.h" 11 #include "content/browser/renderer_host/render_view_host_impl.h"
12 #include "content/browser/web_contents/web_drag_utils_win.h" 12 #include "content/browser/web_contents/web_drag_utils_win.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/browser/web_drag_dest_delegate.h" 14 #include "content/public/browser/web_drag_dest_delegate.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
18 #include "ui/base/clipboard/clipboard_util_win.h" 18 #include "ui/base/clipboard/clipboard_util_win.h"
19 #include "ui/base/dragdrop/os_exchange_data.h" 19 #include "ui/base/dragdrop/os_exchange_data.h"
20 #include "ui/base/dragdrop/os_exchange_data_provider_win.h" 20 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
21 #include "ui/base/window_open_disposition.h"
21 #include "ui/gfx/point.h" 22 #include "ui/gfx/point.h"
22 #include "webkit/glue/webdropdata.h" 23 #include "webkit/glue/webdropdata.h"
23 #include "webkit/glue/window_open_disposition.h"
24 24
25 using WebKit::WebDragOperationNone; 25 using WebKit::WebDragOperationNone;
26 using WebKit::WebDragOperationCopy; 26 using WebKit::WebDragOperationCopy;
27 using WebKit::WebDragOperationLink; 27 using WebKit::WebDragOperationLink;
28 using WebKit::WebDragOperationMove; 28 using WebKit::WebDragOperationMove;
29 using WebKit::WebDragOperationGeneric; 29 using WebKit::WebDragOperationGeneric;
30 30
31 namespace content { 31 namespace content {
32 namespace { 32 namespace {
33 33
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // This isn't always correct, but at least it's a close approximation. 227 // This isn't always correct, but at least it's a close approximation.
228 // For now, we always map a move to a copy to prevent potential data loss. 228 // For now, we always map a move to a copy to prevent potential data loss.
229 DWORD drop_effect = WebDragOpToWinDragOp(drag_cursor_); 229 DWORD drop_effect = WebDragOpToWinDragOp(drag_cursor_);
230 DWORD result = drop_effect != DROPEFFECT_MOVE ? drop_effect : DROPEFFECT_COPY; 230 DWORD result = drop_effect != DROPEFFECT_MOVE ? drop_effect : DROPEFFECT_COPY;
231 231
232 drop_data_.reset(); 232 drop_data_.reset();
233 return result; 233 return result;
234 } 234 }
235 235
236 } // namespace content 236 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_drag_dest_mac.mm ('k') | content/public/browser/page_navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698