Rename WindowDragDropDelegate->DragDropDelegate

ui/aura_shell/drag_drop_controller.h

 // 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.
 
 #ifndef UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
 #define UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ skipping 10 matching lines @@
 namespace aura_shell {
 
 namespace test {
 class DragDropControllerTest;
 }
 
 namespace internal {
 
 class DragImageView;
 
-class AURA_SHELL_EXPORT DragDropController : public aura::DragDropClient,
-                                             public aura::EventFilter {
+class AURA_SHELL_EXPORT DragDropController
+    : public aura::client::DragDropClient,
+      public aura::EventFilter {
  public:
   DragDropController();
   virtual ~DragDropController();
 
   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::DragDropClient:
+  // Overridden from aura::client::DragDropClient:
   virtual int StartDragAndDrop(const ui::OSExchangeData& data,
                                 int operation) OVERRIDE;
   virtual void DragUpdate(aura::Window* target,
                           const aura::MouseEvent& event) OVERRIDE;
   virtual void Drop(aura::Window* target,
                     const aura::MouseEvent& event) OVERRIDE;
   virtual void DragCancel() OVERRIDE;
   virtual bool IsDragDropInProgress() OVERRIDE;
 
   // Overridden from aura::EventFilter:
@@ skipping 21 matching lines @@
   // Only be used for tests.
   bool should_block_during_drag_drop_;
 
   DISALLOW_COPY_AND_ASSIGN(DragDropController);
 };
 
 }  // namespace internal
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_