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

Unified Diff: views/controls/menu/menu_delegate.h

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/controls/menu/menu_controller.cc ('k') | views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_delegate.h
===================================================================
--- views/controls/menu/menu_delegate.h (revision 71798)
+++ views/controls/menu/menu_delegate.h (working copy)
@@ -9,8 +9,8 @@
#include <set>
#include <string>
-#include "app/drag_drop_types.h"
#include "base/logging.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "views/controls/menu/controller.h"
#include "views/controls/menu/menu_item_view.h"
@@ -151,24 +151,24 @@
// is set based on the location of the mouse, reset to specify a different
// position.
//
- // If a drop should not be allowed, returned DragDropTypes::DRAG_NONE.
+ // If a drop should not be allowed, returned ui::DragDropTypes::DRAG_NONE.
virtual int GetDropOperation(MenuItemView* item,
const DropTargetEvent& event,
DropPosition* position) {
NOTREACHED() << "If you override CanDrop, you need to override this too";
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
// Invoked to perform the drop operation. This is ONLY invoked if
// canDrop returned true for the parent menu item, and GetDropOperation
- // returned an operation other than DragDropTypes::DRAG_NONE.
+ // returned an operation other than ui::DragDropTypes::DRAG_NONE.
//
// menu indicates the menu the drop occurred on.
virtual int OnPerformDrop(MenuItemView* menu,
DropPosition position,
const DropTargetEvent& event) {
NOTREACHED() << "If you override CanDrop, you need to override this too";
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
// Invoked to determine if it is possible for the user to drag the specified
« no previous file with comments | « views/controls/menu/menu_controller.cc ('k') | views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698