Move more dnd related files to ui/base

views/controls/button/menu_button.cc

 // 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.
 
 #include "views/controls/button/menu_button.h"
 
-#include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 162 matching lines @@
   }
   return true;
 }
 
 bool MenuButton::OnMousePressed(const MouseEvent& e) {
   RequestFocus();
   if (state() != BS_DISABLED) {
     // If we're draggable (GetDragOperations returns a non-zero value), then
     // don't pop on press, instead wait for release.
     if (e.IsOnlyLeftMouseButton() && HitTest(e.location()) &&
-        GetDragOperations(e.location()) == DragDropTypes::DRAG_NONE) {
+        GetDragOperations(e.location()) == ui::DragDropTypes::DRAG_NONE) {
       TimeDelta delta = Time::Now() - menu_closed_time_;
       int64 delta_in_milliseconds = delta.InMilliseconds();
       if (delta_in_milliseconds > kMinimumTimeBetweenButtonClicks) {
         return Activate();
       }
     }
   }
   return true;
 }
 
 void MenuButton::OnMouseReleased(const MouseEvent& e,
                                  bool canceled) {
   // Explicitly test for left mouse button to show the menu. If we tested for
   // !IsTriggerableEvent it could lead to a situation where we end up showing
   // the menu and context menu (this would happen if the right button is not
   // triggerable and there's a context menu).
-  if (GetDragOperations(e.location()) != DragDropTypes::DRAG_NONE &&
+  if (GetDragOperations(e.location()) != ui::DragDropTypes::DRAG_NONE &&
       state() != BS_DISABLED && !canceled && !InDrag() &&
       e.IsOnlyLeftMouseButton() && HitTest(e.location())) {
     Activate();
   } else {
     TextButton::OnMouseReleased(e, canceled);
   }
 }
 
 bool MenuButton::OnKeyPressed(const KeyEvent& e) {
   if (e.GetKeyCode() == ui::VKEY_SPACE ||
@@ skipping 42 matching lines @@
 
 AccessibilityTypes::State MenuButton::GetAccessibleState() {
   return AccessibilityTypes::STATE_HASPOPUP;
 }
 
 std::string MenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views