From 02bae0f37e6b09992f3b81792735010f28b9542e Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Wed, 19 Jan 2011 20:22:00 +0000 Subject: Move more dnd related files to ui/base BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6250014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71828 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/autocomplete') diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 376c18e2463..bdc978f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -13,8 +13,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/win/drag_source.h" -#include "app/win/drop_target.h" #include "app/win/iat_patch_function.h" #include "app/win/win_util.h" #include "base/auto_reset.h" @@ -47,6 +45,8 @@ #include "skia/ext/skia_utils_win.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" +#include "ui/base/dragdrop/drag_source.h" +#include "ui/base/dragdrop/drop_target.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -68,7 +68,7 @@ namespace { // URL. A drop of plain text from the same edit either copies or moves the // selected text, and a drop of plain text from a source other than the edit // does a paste and go. -class EditDropTarget : public app::win::DropTarget { +class EditDropTarget : public ui::DropTarget { public: explicit EditDropTarget(AutocompleteEditViewWin* edit); @@ -119,7 +119,7 @@ DWORD CopyOrLinkDropEffect(DWORD effect) { } EditDropTarget::EditDropTarget(AutocompleteEditViewWin* edit) - : app::win::DropTarget(edit->m_hWnd), + : ui::DropTarget(edit->m_hWnd), edit_(edit), drag_has_url_(false), drag_has_string_(false) { @@ -2427,7 +2427,7 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) { data.SetString(text_to_write); - scoped_refptr drag_source(new app::win::DragSource); + scoped_refptr drag_source(new ui::DragSource); DWORD dropped_mode; AutoReset auto_reset_in_drag(&in_drag_, true); if (DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data), -- cgit v1.1