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

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 2828543003: chromeos: converts DragImageViewTest to AshTestBase (Closed)
Patch Set: cleanup Created 3 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 | « no previous file | ash/drag_drop/drag_image_view.h » ('j') | ash/test/ash_test_base.h » ('J')
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 8308a4df300d4714369690e0c691a56ca8b0e847..5a5643002f63f0516c092905dbb1d4e3f26a0be3 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -12,6 +12,7 @@
#include "ash/shell_port.h"
#include "ash/wm_window.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "base/run_loop.h"
@@ -203,8 +204,8 @@ int DragDropController::StartDragAndDrop(
drag_image_final_bounds_for_cancel_animation_ =
gfx::Rect(start_location - provider->GetDragImageOffset(),
provider->GetDragImage().size());
- drag_image_.reset(
- new DragImageView(WmWindow::Get(source_window->GetRootWindow()), source));
+ drag_image_ =
+ base::MakeUnique<DragImageView>(source_window->GetRootWindow(), source);
drag_image_->SetImage(provider->GetDragImage());
drag_image_offset_ = provider->GetDragImageOffset();
gfx::Rect drag_image_bounds(start_location, drag_image_->GetPreferredSize());
« no previous file with comments | « no previous file | ash/drag_drop/drag_image_view.h » ('j') | ash/test/ash_test_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698