Rename WindowDragDropDelegate->DragDropDelegate

ui/aura_shell/drag_drop_controller.cc

 // Copyright (c) 2011 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 "ui/aura_shell/drag_drop_controller.h"
 
 #include "base/message_loop.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/window_drag_drop_delegate.h"
+#include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/drag_image_view.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace internal {
 
 using aura::RootWindow;
 
 namespace {
-aura::WindowDragDropDelegate* GetDragDropDelegate(aura::Window* window) {
-  if (!window)
-    return NULL;
-  void* prop = window->GetProperty(aura::kDragDropDelegateKey);
-  if (!prop)
-    return NULL;
-  return static_cast<aura::WindowDragDropDelegate*>(prop);
-}
-
 const gfx::Point kDragDropWidgetOffset(0, 0);
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DragDropController, public:
 
 DragDropController::DragDropController()
     : aura::EventFilter(RootWindow::GetInstance()),
       drag_image_(NULL),
       drag_data_(NULL),
       drag_operation_(0),
       dragged_window_(NULL),
       drag_drop_in_progress_(false),
       should_block_during_drag_drop_(true) {
   Shell::GetInstance()->AddRootWindowEventFilter(this);
+  aura::client::SetDragDropClient(this);
 }
 
 DragDropController::~DragDropController() {
   Shell::GetInstance()->RemoveRootWindowEventFilter(this);
   Cleanup();
 }
 
 int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data,
                                           int operation) {
   DCHECK(!drag_drop_in_progress_);
@@ skipping 18 matching lines @@
 
   if (should_block_during_drag_drop_) {
     MessageLoopForUI::current()->RunWithDispatcher(
         RootWindow::GetInstance()->GetDispatcher());
   }
   return drag_operation_;
 }
 
 void DragDropController::DragUpdate(aura::Window* target,
                                     const aura::MouseEvent& event) {
-  aura::WindowDragDropDelegate* delegate = NULL;
+  aura::client::DragDropDelegate* delegate = NULL;
   if (target != dragged_window_) {
-    if ((delegate = GetDragDropDelegate(dragged_window_)))
+    if (dragged_window_ &&
+        (delegate = aura::client::GetDragDropDelegate(dragged_window_))) {
       delegate->OnDragExited();
+    }
     dragged_window_ = target;
-    if ((delegate = GetDragDropDelegate(dragged_window_))) {
+    if ((delegate = aura::client::GetDragDropDelegate(dragged_window_))) {
       aura::DropTargetEvent e(*drag_data_, event.location(), drag_operation_);
       delegate->OnDragEntered(e);
     }
   } else {
-    if ((delegate = GetDragDropDelegate(dragged_window_))) {
+    if ((delegate = aura::client::GetDragDropDelegate(dragged_window_))) {
       aura::DropTargetEvent e(*drag_data_, event.location(), drag_operation_);
       int op = delegate->OnDragUpdated(e);
        gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)?
            aura::kCursorMove : aura::kCursorHand;
        RootWindow::GetInstance()->SetCursor(cursor);
     }
   }
 
   DCHECK(drag_image_.get());
   if (drag_image_->visible()) {
     drag_image_->SetScreenPosition(RootWindow::GetInstance()->
         last_mouse_location().Add(kDragDropWidgetOffset));
   }
 }
 
 void DragDropController::Drop(aura::Window* target,
                               const aura::MouseEvent& event) {
-  aura::WindowDragDropDelegate* delegate = NULL;
+  aura::client::DragDropDelegate* delegate = NULL;
   DCHECK(target == dragged_window_);
-  if ((delegate = GetDragDropDelegate(dragged_window_))) {
+  if ((delegate = aura::client::GetDragDropDelegate(dragged_window_))) {
     aura::DropTargetEvent e(*drag_data_, event.location(), drag_operation_);
     drag_operation_ = delegate->OnPerformDrop(e);
     // TODO(varunjain): if drag_op is 0, do drag widget flying back animation
   }
 
   Cleanup();
   if (should_block_during_drag_drop_)
     MessageLoop::current()->Quit();
 }
 
@@ skipping 45 matching lines @@
 // DragDropController, private:
 
 void DragDropController::Cleanup() {
   drag_image_.reset();
   drag_data_ = NULL;
   drag_drop_in_progress_ = false;
 }
 
 }  // namespace internal
 }  // namespace aura_shell