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

Unified Diff: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.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
Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
===================================================================
--- chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (revision 71798)
+++ chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (working copy)
@@ -145,13 +145,13 @@
if ((item->GetCommand() == 0) && (*position == DROP_BEFORE)) {
BrowserActionDragData drop_data;
if (!drop_data.Read(event.GetData()))
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
if (drop_data.index() < owner_->VisibleBrowserActions())
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
- return DragDropTypes::DRAG_MOVE;
+ return ui::DragDropTypes::DRAG_MOVE;
}
int BrowserActionOverflowMenuController::OnPerformDrop(
@@ -160,7 +160,7 @@
const views::DropTargetEvent& event) {
BrowserActionDragData drop_data;
if (!drop_data.Read(event.GetData()))
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
size_t drop_index;
ViewForId(menu->GetCommand(), &drop_index);
@@ -175,7 +175,7 @@
if (for_drop_)
delete this;
- return DragDropTypes::DRAG_MOVE;
+ return ui::DragDropTypes::DRAG_MOVE;
}
bool BrowserActionOverflowMenuController::CanDrag(views::MenuItemView* menu) {
@@ -194,7 +194,7 @@
int BrowserActionOverflowMenuController::GetDragOperations(
views::MenuItemView* sender) {
- return DragDropTypes::DRAG_MOVE;
+ return ui::DragDropTypes::DRAG_MOVE;
}
BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/frame/browser_root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698