mash: Migrate ash::DragImageView to wm common types

ash/drag_drop/drag_drop_controller.h

 // 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.
 
 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/display/window_tree_host_manager.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/wm/public/drag_drop_client.h"
 
 namespace gfx {
 class LinearAnimation;
 }
 
 namespace ash {
 class DragDropTracker;
 class DragDropTrackerDelegate;
 class DragImageView;
 
 namespace test {
 class DragDropControllerTest;
 }
 
 class ASH_EXPORT DragDropController : public aura::client::DragDropClient,
                                       public ui::EventHandler,
                                       public gfx::AnimationDelegate,
-                                      public aura::WindowObserver {
+                                      public aura::WindowObserver,
+                                      public WindowTreeHostManager::Observer {

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

nit: use ash/common/wm_display_observer.h instead?
(even though we might not really converting this directly?)

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

Done.

  public:
   DragDropController();
   ~DragDropController() override;
 
   void set_should_block_during_drag_drop(bool should_block_during_drag_drop) {
     should_block_during_drag_drop_ = should_block_during_drag_drop;
   }
 
   // Overridden from aura::client::DragDropClient:
   int StartDragAndDrop(const ui::OSExchangeData& data,
@@ skipping 29 matching lines @@
   virtual void DoDragCancel(int drag_cancel_animation_duration_ms);
 
  private:
   friend class ash::test::DragDropControllerTest;
 
   // Overridden from gfx::AnimationDelegate:
   void AnimationEnded(const gfx::Animation* animation) override;
   void AnimationProgressed(const gfx::Animation* animation) override;
   void AnimationCanceled(const gfx::Animation* animation) override;
 
+  // WindowTreeHostManager::Observer:
+  void OnDisplayConfigurationChanging() override;
+
   // Helper method to start drag widget flying back animation.
   void StartCanceledAnimation(int animation_duration_ms);
 
   // Helper method to forward |pending_log_tap_| event to |drag_source_window_|.
   void ForwardPendingLongTap();
 
   // Helper method to reset everything.
   void Cleanup();
 
   std::unique_ptr<DragImageView> drag_image_;
@@ skipping 30 matching lines @@
   std::unique_ptr<ui::GestureEvent> pending_long_tap_;
 
   base::WeakPtrFactory<DragDropController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DragDropController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_