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

Unified Diff: views/widget/drop_target_win.cc

Issue 6250014: Move more dnd related files to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/drop_target_win.h ('k') | views/widget/root_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/drop_target_win.cc
===================================================================
--- views/widget/drop_target_win.cc (revision 71798)
+++ views/widget/drop_target_win.cc (working copy)
@@ -4,8 +4,8 @@
#include "views/widget/drop_target_win.h"
-#include "app/drag_drop_types.h"
#include "gfx/point.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
#include "views/widget/root_view.h"
@@ -17,7 +17,7 @@
namespace views {
DropTargetWin::DropTargetWin(RootView* root_view)
- : app::win::DropTarget(root_view->GetWidget()->GetNativeView()),
+ : ui::DropTarget(root_view->GetWidget()->GetNativeView()),
helper_(root_view) {
}
@@ -37,8 +37,8 @@
OSExchangeData data(new OSExchangeDataProviderWin(data_object));
int drop_operation =
helper_.OnDragOver(data, root_view_location,
- DragDropTypes::DropEffectToDragOperation(effect));
- return DragDropTypes::DragOperationToDropEffect(drop_operation);
+ ui::DragDropTypes::DropEffectToDragOperation(effect));
+ return ui::DragDropTypes::DragOperationToDropEffect(drop_operation);
}
void DropTargetWin::OnDragLeave(IDataObject* data_object) {
@@ -53,11 +53,11 @@
View::ConvertPointToView(NULL, helper_.root_view(), &root_view_location);
OSExchangeData data(new OSExchangeDataProviderWin(data_object));
- int drop_operation = DragDropTypes::DropEffectToDragOperation(effect);
+ int drop_operation = ui::DragDropTypes::DropEffectToDragOperation(effect);
drop_operation = helper_.OnDragOver(data, root_view_location,
drop_operation);
drop_operation = helper_.OnDrop(data, root_view_location, drop_operation);
- return DragDropTypes::DragOperationToDropEffect(drop_operation);
+ return ui::DragDropTypes::DragOperationToDropEffect(drop_operation);
}
} // namespace views
« no previous file with comments | « views/widget/drop_target_win.h ('k') | views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698