| 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(
|
|
|