| Index: chrome/browser/ui/views/browser_actions_container.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/browser_actions_container.cc (revision 71798)
|
| +++ chrome/browser/ui/views/browser_actions_container.cc (working copy)
|
| @@ -634,7 +634,7 @@
|
| if (GetViewForPoint(event.location()) == chevron_) {
|
| if (show_menu_task_factory_.empty() && !overflow_menu_)
|
| StartShowFolderDropMenuTimer();
|
| - return DragDropTypes::DRAG_MOVE;
|
| + return ui::DragDropTypes::DRAG_MOVE;
|
| }
|
| StopShowFolderDropMenuTimer();
|
|
|
| @@ -684,7 +684,7 @@
|
| SetDropIndicator(width_before_icons + (before_icon * IconWidth(true)) -
|
| (kItemSpacing / 2));
|
|
|
| - return DragDropTypes::DRAG_MOVE;
|
| + return ui::DragDropTypes::DRAG_MOVE;
|
| }
|
|
|
| void BrowserActionsContainer::OnDragExited() {
|
| @@ -697,7 +697,7 @@
|
| const views::DropTargetEvent& event) {
|
| BrowserActionDragData data;
|
| if (!data.Read(event.GetData()))
|
| - return DragDropTypes::DRAG_NONE;
|
| + return ui::DragDropTypes::DRAG_NONE;
|
|
|
| // Make sure we have the same view as we started with.
|
| DCHECK_EQ(browser_action_views_[data.index()]->button()->extension()->id(),
|
| @@ -732,7 +732,7 @@
|
| browser_action_views_[data.index()]->button()->extension(), i);
|
|
|
| OnDragExited(); // Perform clean up after dragging.
|
| - return DragDropTypes::DRAG_MOVE;
|
| + return ui::DragDropTypes::DRAG_MOVE;
|
| }
|
|
|
| void BrowserActionsContainer::OnThemeChanged() {
|
| @@ -777,7 +777,7 @@
|
|
|
| int BrowserActionsContainer::GetDragOperations(View* sender,
|
| const gfx::Point& p) {
|
| - return DragDropTypes::DRAG_MOVE;
|
| + return ui::DragDropTypes::DRAG_MOVE;
|
| }
|
|
|
| bool BrowserActionsContainer::CanStartDrag(View* sender,
|
|
|