| Index: ash/drag_drop/drag_drop_controller.cc
|
| diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
|
| index 1ec53aaca33114af10dfaccd752d511f0891db47..e2c6e6a43ebdf1cc673b58d665136144af635e89 100644
|
| --- a/ash/drag_drop/drag_drop_controller.cc
|
| +++ b/ash/drag_drop/drag_drop_controller.cc
|
| @@ -372,7 +372,7 @@ void DragDropController::OnMouseEvent(ui::MouseEvent* event) {
|
| event->StopPropagation();
|
| return;
|
| }
|
| - scoped_ptr<ui::LocatedEvent> translated_event(
|
| + std::unique_ptr<ui::LocatedEvent> translated_event(
|
| drag_drop_tracker_->ConvertEvent(translated_target, *event));
|
| switch (translated_event->type()) {
|
| case ui::ET_MOUSE_DRAGGED:
|
| @@ -440,7 +440,7 @@ void DragDropController::OnGestureEvent(ui::GestureEvent* event) {
|
| event->SetHandled();
|
| return;
|
| }
|
| - scoped_ptr<ui::LocatedEvent> translated_event(
|
| + std::unique_ptr<ui::LocatedEvent> translated_event(
|
| drag_drop_tracker_->ConvertEvent(translated_target, touch_offset_event));
|
|
|
| switch (event->type()) {
|
| @@ -567,7 +567,7 @@ void DragDropController::Cleanup() {
|
| drag_data_ = NULL;
|
| // Cleanup can be called again while deleting DragDropTracker, so delete
|
| // the pointer with a local variable to avoid double free.
|
| - scoped_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_);
|
| + std::unique_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_);
|
| }
|
|
|
| } // namespace ash
|
|
|