Move more dnd related files to ui/base

views/view.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/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
 #include <iostream>
 #endif
 
-#include "app/drag_drop_types.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
@@ skipping 461 matching lines @@
       GetDragOperations(e.location()) : 0;
   ContextMenuController* context_menu_controller = e.IsRightMouseButton() ?
       context_menu_controller_ : 0;
 
   const bool result = OnMousePressed(e);
   // WARNING: we may have been deleted, don't use any View variables;
 
   if (!enabled)
     return result;
 
-  if (drag_operations != DragDropTypes::DRAG_NONE) {
+  if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
     drag_info->PossibleDrag(e.location());
     return true;
   }
   return !!context_menu_controller || result;
 }
 
 bool View::ProcessMouseDragged(const MouseEvent& e, DragInfo* drag_info) {
   // Copy the field, that way if we're deleted after drag and drop no harm is
   // done.
   ContextMenuController* context_menu_controller = context_menu_controller_;
@@ skipping 88 matching lines @@
 void View::RemoveAllChildViews(bool delete_views) {
   ViewList::iterator iter;
   while ((iter = child_views_.begin()) != child_views_.end()) {
     DoRemoveChildView(*iter, false, false, delete_views);
   }
   UpdateTooltip();
 }
 
 void View::DoDrag(const MouseEvent& e, const gfx::Point& press_pt) {
   int drag_operations = GetDragOperations(press_pt);
-  if (drag_operations == DragDropTypes::DRAG_NONE)
+  if (drag_operations == ui::DragDropTypes::DRAG_NONE)
     return;
 
   OSExchangeData data;
   WriteDragData(press_pt, &data);
 
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   RootView* root_view = GetRootView();
   root_view->StartDragForViewFromMouseEvent(this, data, drag_operations);
 }
@@ skipping 516 matching lines @@
       accelerators_->clear();
       accelerators_.reset();
     }
     registered_accelerator_count_ = 0;
   }
 }
 
 int View::GetDragOperations(const gfx::Point& press_pt) {
   return drag_controller_ ?
       drag_controller_->GetDragOperations(this, press_pt) :
-      DragDropTypes::DRAG_NONE;
+      ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::WriteDragData(const gfx::Point& press_pt, OSExchangeData* data) {
   DCHECK(drag_controller_);
   drag_controller_->WriteDragData(this, press_pt, data);
 }
 
 void View::OnDragDone() {
 }
 
@@ skipping 227 matching lines @@
 
 bool View::CanDrop(const OSExchangeData& data) {
   // TODO(sky): when I finish up migration, this should default to true.
   return false;
 }
 
 void View::OnDragEntered(const DropTargetEvent& event) {
 }
 
 int View::OnDragUpdated(const DropTargetEvent& event) {
-  return DragDropTypes::DRAG_NONE;
+  return ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::OnDragExited() {
 }
 
 int View::OnPerformDrop(const DropTargetEvent& event) {
-  return DragDropTypes::DRAG_NONE;
+  return ui::DragDropTypes::DRAG_NONE;
 }
 
 // static
 bool View::ExceededDragThreshold(int delta_x, int delta_y) {
   return (abs(delta_x) > GetHorizontalDragThreshold() ||
           abs(delta_y) > GetVerticalDragThreshold());
 }
 
 // Tooltips -----------------------------------------------------------------
 bool View::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
@@ skipping 118 matching lines @@
   possible_drag = false;
   start_pt = gfx::Point();
 }
 
 void View::DragInfo::PossibleDrag(const gfx::Point& p) {
   possible_drag = true;
   start_pt = p;
 }
 
 }  // namespace