| 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 03c1169214a60ab2e4f3c150b66554573e33f098..8308a4df300d4714369690e0c691a56ca8b0e847 100644
|
| --- a/ash/drag_drop/drag_drop_controller.cc
|
| +++ b/ash/drag_drop/drag_drop_controller.cc
|
| @@ -9,7 +9,7 @@
|
| #include "ash/drag_drop/drag_drop_tracker.h"
|
| #include "ash/drag_drop/drag_image_view.h"
|
| #include "ash/shell.h"
|
| -#include "ash/wm_shell.h"
|
| +#include "ash/shell_port.h"
|
| #include "ash/wm_window.h"
|
| #include "base/bind.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -136,11 +136,11 @@ DragDropController::DragDropController()
|
| current_drag_event_source_(ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE),
|
| weak_factory_(this) {
|
| Shell::Get()->PrependPreTargetHandler(this);
|
| - WmShell::Get()->AddDisplayObserver(this);
|
| + ShellPort::Get()->AddDisplayObserver(this);
|
| }
|
|
|
| DragDropController::~DragDropController() {
|
| - WmShell::Get()->RemoveDisplayObserver(this);
|
| + ShellPort::Get()->RemoveDisplayObserver(this);
|
| Shell::Get()->RemovePreTargetHandler(this);
|
| Cleanup();
|
| if (cancel_animation_)
|
|
|