| Index: chrome/browser/autocomplete/autocomplete_edit_view_win.cc
|
| ===================================================================
|
| --- chrome/browser/autocomplete/autocomplete_edit_view_win.cc (revision 71798)
|
| +++ chrome/browser/autocomplete/autocomplete_edit_view_win.cc (working copy)
|
| @@ -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 @@
|
| // 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 @@
|
| }
|
|
|
| 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 @@
|
|
|
| data.SetString(text_to_write);
|
|
|
| - scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
|
| + scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
|
| DWORD dropped_mode;
|
| AutoReset<bool> auto_reset_in_drag(&in_drag_, true);
|
| if (DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
|
|
|