Move more dnd related files to ui/base

views/controls/menu/menu_delegate.h

 // Copyright (c) 2010 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 VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #pragma once
 
 #include <set>
 #include <string>
 
-#include "app/drag_drop_types.h"
 #include "base/logging.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/event.h"
 
 using ui::OSExchangeData;
 
 namespace views {
 
 class DropTargetEvent;
@@ skipping 120 matching lines @@
   // See view for a description of this method.
   virtual bool AreDropTypesRequired(MenuItemView* menu) {
     return false;
   }
 
   // Returns the drop operation for the specified target menu item. This is
   // only invoked if CanDrop returned true for the parent menu. position
   // is set based on the location of the mouse, reset to specify a different
   // position.
   //
-  // If a drop should not be allowed, returned DragDropTypes::DRAG_NONE.
+  // If a drop should not be allowed, returned ui::DragDropTypes::DRAG_NONE.
   virtual int GetDropOperation(MenuItemView* item,
                                const DropTargetEvent& event,
                                DropPosition* position) {
     NOTREACHED() << "If you override CanDrop, you need to override this too";
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   // Invoked to perform the drop operation. This is ONLY invoked if
   // canDrop returned true for the parent menu item, and GetDropOperation
-  // returned an operation other than DragDropTypes::DRAG_NONE.
+  // returned an operation other than ui::DragDropTypes::DRAG_NONE.
   //
   // menu indicates the menu the drop occurred on.
   virtual int OnPerformDrop(MenuItemView* menu,
                             DropPosition position,
                             const DropTargetEvent& event) {
     NOTREACHED() << "If you override CanDrop, you need to override this too";
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   // Invoked to determine if it is possible for the user to drag the specified
   // menu item.
   virtual bool CanDrag(MenuItemView* menu) {
     return false;
   }
 
   // Invoked to write the data for a drag operation to data. sender is the
   // MenuItemView being dragged.
@@ skipping 34 matching lines @@
   virtual int GetMaxWidthForMenu() {
     // NOTE: this needs to be large enough to accommodate the wrench menu with
     // big fonts.
     return 800;
   }
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_