| 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 d3354652fd8de35ee88d495d5fd4448d6c3544c2..07ab4f39337690f7340edd4d2ce3f2ee6fe5c9cd 100644
|
| --- a/ash/drag_drop/drag_drop_controller.cc
|
| +++ b/ash/drag_drop/drag_drop_controller.cc
|
| @@ -33,8 +33,6 @@
|
| namespace ash {
|
| namespace internal {
|
|
|
| -using aura::RootWindow;
|
| -
|
| namespace {
|
| // The duration of the drag cancel animation in millisecond.
|
| const int kCancelAnimationDuration = 250;
|
| @@ -160,7 +158,7 @@ DragDropController::~DragDropController() {
|
|
|
| int DragDropController::StartDragAndDrop(
|
| const ui::OSExchangeData& data,
|
| - aura::RootWindow* root_window,
|
| + aura::Window* root_window,
|
| aura::Window* source_window,
|
| const gfx::Point& root_location,
|
| int operation,
|
|
|