mash: Migrate ash::DragImageView to wm common types

ash/drag_drop/drag_drop_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/drag_drop/drag_drop_controller.h"
 
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
+#include "ash/common/drag_drop/drag_image_view.h"
 #include "ash/drag_drop/drag_drop_tracker.h"
-#include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 106 matching lines @@
 DragDropController::DragDropController()
     : drag_data_(NULL),
       drag_operation_(0),
       drag_window_(NULL),
       drag_source_window_(NULL),
       should_block_during_drag_drop_(true),
       drag_drop_window_delegate_(new DragDropTrackerDelegate(this)),
       current_drag_event_source_(ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE),
       weak_factory_(this) {
   Shell::GetInstance()->PrependPreTargetHandler(this);
+  Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
 }
 
 DragDropController::~DragDropController() {
+  Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
   Shell::GetInstance()->RemovePreTargetHandler(this);
   Cleanup();
   if (cancel_animation_)
     cancel_animation_->End();
   if (drag_image_)
     drag_image_.reset();
 }
 
 int DragDropController::StartDragAndDrop(
     const ui::OSExchangeData& data,
@@ skipping 42 matching lines @@
   float drag_image_scale = 1;
   int drag_image_vertical_offset = 0;
   if (source == ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH) {
     drag_image_scale = kTouchDragImageScale;
     drag_image_vertical_offset = kTouchDragImageVerticalOffset;
   }
   gfx::Point start_location = screen_location;
   drag_image_final_bounds_for_cancel_animation_ =
       gfx::Rect(start_location - provider->GetDragImageOffset(),
                 provider->GetDragImage().size());
-  drag_image_.reset(new DragImageView(source_window->GetRootWindow(), source));
+  drag_image_.reset(new DragImageView(
+      WmWindowAura::Get(source_window)->GetRootWindow(), source));

[msw, 2016/08/05 19:32:58]

nit: comment here on the reasoning for using WmWindow::GetRootWindow instead of
aura::Window::GetRootWindow?

[James Cook, 2016/08/05 20:10:11]

There's no good reason to change it to WmWindow::GetRootWindow, so I put it back
to aura::Window::GetRootWindow.

   drag_image_->SetImage(provider->GetDragImage());
   drag_image_offset_ = provider->GetDragImageOffset();
   gfx::Rect drag_image_bounds(start_location, drag_image_->GetPreferredSize());
   drag_image_bounds = AdjustDragImageBoundsForScaleAndOffset(
       drag_image_bounds, drag_image_vertical_offset, drag_image_scale,
       &drag_image_offset_);
   drag_image_->SetBoundsInScreen(drag_image_bounds);
   drag_image_->SetWidgetVisible(true);
   if (source == ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH) {
     drag_image_->SetTouchDragOperationHintPosition(
@@ skipping 317 matching lines @@
   gfx::Rect current_bounds = animation->CurrentValueBetween(
       drag_image_initial_bounds_for_cancel_animation_,
       drag_image_final_bounds_for_cancel_animation_);
   drag_image_->SetBoundsInScreen(current_bounds);
 }
 
 void DragDropController::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
+void DragDropController::OnDisplayConfigurationChanging() {
+  // Abort in-progress drags if a monitor is added or removed because the drag
+  // image widget's container may be destroyed.
+  if (IsDragDropInProgress())
+    DragCancel();
+}
+
 void DragDropController::StartCanceledAnimation(int animation_duration_ms) {
   DCHECK(drag_image_.get());
   drag_image_->SetTouchDragOperationHintOff();
   drag_image_initial_bounds_for_cancel_animation_ =
       drag_image_->GetBoundsInScreen();
   cancel_animation_.reset(CreateCancelAnimation(
       animation_duration_ms, kCancelAnimationFrameRate, this));
   cancel_animation_->Start();
 }
 
@@ skipping 12 matching lines @@
   if (drag_window_)
     drag_window_->RemoveObserver(this);
   drag_window_ = NULL;
   drag_data_ = NULL;
   // Cleanup can be called again while deleting DragDropTracker, so delete
   // the pointer with a local variable to avoid double free.
   std::unique_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_);
 }
 
 }  // namespace ash