| Index: ash/shelf/shelf_view.cc
|
| diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
|
| index 65d09fde97be4b84d393c1578b7c0cf7835dfa00..d492b30587a2c49da68fa9d9082df93e692539ab 100644
|
| --- a/ash/shelf/shelf_view.cc
|
| +++ b/ash/shelf/shelf_view.cc
|
| @@ -1583,8 +1583,8 @@ void ShelfView::PointerDraggedOnButton(views::View* view,
|
| // To prepare all drag types (moving an item in the shelf and dragging off),
|
| // we should check the x-axis and y-axis offset.
|
| if (!dragging() && drag_view_ &&
|
| - ((abs(event.x() - drag_offset_) >= kMinimumDragDistance) ||
|
| - (abs(event.y() - drag_offset_) >= kMinimumDragDistance))) {
|
| + ((std::abs(event.x() - drag_offset_) >= kMinimumDragDistance) ||
|
| + (std::abs(event.y() - drag_offset_) >= kMinimumDragDistance))) {
|
| PrepareForDrag(pointer, event);
|
| }
|
| if (drag_pointer_ == pointer)
|
|
|