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

Unified Diff: views/widget/drop_helper.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/view_win.cc ('k') | views/widget/drop_target_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/drop_helper.cc
===================================================================
--- views/widget/drop_helper.cc (revision 71798)
+++ views/widget/drop_helper.cc (working copy)
@@ -4,7 +4,7 @@
#include "views/widget/drop_helper.h"
-#include "app/drag_drop_types.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
#include "views/view.h"
#include "views/widget/root_view.h"
@@ -53,11 +53,11 @@
View* drop_view = target_view_;
deepest_view_ = target_view_ = NULL;
if (!drop_view)
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
- if (drag_operation == DragDropTypes::DRAG_NONE) {
+ if (drag_operation == ui::DragDropTypes::DRAG_NONE) {
drop_view->OnDragExited();
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
gfx::Point view_location(root_view_location);
@@ -136,7 +136,7 @@
const gfx::Point& root_view_location,
int drag_operation) {
if (!target_view_)
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
gfx::Point target_view_location(root_view_location);
View::ConvertPointToView(root_view_, target_view_, &target_view_location);
« no previous file with comments | « views/view_win.cc ('k') | views/widget/drop_target_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698