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

Side by Side Diff: ash/drag_drop/drag_drop_controller.cc

Issue 609083002: Store the result of Pass() in a local variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dragdrop: . Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/drag_drop/drag_drop_tracker.h" 7 #include "ash/drag_drop/drag_drop_tracker.h"
8 #include "ash/drag_drop/drag_image_view.h" 8 #include "ash/drag_drop/drag_image_view.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 if (drag_source_window_) 550 if (drag_source_window_)
551 drag_source_window_->RemoveObserver(this); 551 drag_source_window_->RemoveObserver(this);
552 drag_source_window_ = NULL; 552 drag_source_window_ = NULL;
553 } 553 }
554 554
555 void DragDropController::Cleanup() { 555 void DragDropController::Cleanup() {
556 if (drag_window_) 556 if (drag_window_)
557 drag_window_->RemoveObserver(this); 557 drag_window_->RemoveObserver(this);
558 drag_window_ = NULL; 558 drag_window_ = NULL;
559 drag_data_ = NULL; 559 drag_data_ = NULL;
560 // Cleanup can be called again while deleting DragDropTracker, so use Pass 560 // Cleanup can be called again while deleting DragDropTracker, so delete
561 // instead of reset to avoid double free. 561 // the pointer with a local variable to avoid double free.
562 drag_drop_tracker_.Pass(); 562 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass();
563 } 563 }
564 564
565 } // namespace ash 565 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698