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 1500dae1913f88674b162c338b565e37e79a55b9..f35039c3dec09cbcc37751339a787fe5805242a8 100644 |
--- a/ash/drag_drop/drag_drop_controller.cc |
+++ b/ash/drag_drop/drag_drop_controller.cc |
@@ -155,9 +155,9 @@ DragDropController::DragDropController() |
DragDropController::~DragDropController() { |
Shell::GetInstance()->RemovePreTargetHandler(this); |
Cleanup(); |
- if (cancel_animation_.get()) |
+ if (cancel_animation_) |
cancel_animation_->End(); |
- if (drag_image_.get()) |
+ if (drag_image_) |
drag_image_.reset(); |
} |
@@ -224,7 +224,7 @@ int DragDropController::StartDragAndDrop( |
drag_window_ = NULL; |
// Ends cancel animation if it's in progress. |
- if (cancel_animation_.get()) |
+ if (cancel_animation_) |
cancel_animation_->End(); |
#if !defined(OS_MACOSX) |
@@ -487,7 +487,7 @@ void DragDropController::AnimationEnded(const ui::Animation* animation) { |
// started. We do not want to destroy the drag image in that case. |
if (!IsDragDropInProgress()) |
drag_image_.reset(); |
- if (pending_long_tap_.get()) { |
+ if (pending_long_tap_) { |
// If not in a nested message loop, we can forward the long tap right now. |
if (!should_block_during_drag_drop_) |
ForwardPendingLongTap(); |