Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2126)

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 14297013: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/output_configurator_animation.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ash/display/output_configurator_animation.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698