Move more dnd related files to ui/base

chrome/browser/autocomplete/autocomplete_edit_view_win.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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
 #include <richedit.h>
 #include <textserv.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
-#include "app/win/drag_source.h"
-#include "app/win/drop_target.h"
 #include "app/win/iat_patch_function.h"
 #include "app/win/win_util.h"
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/url_util.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/base/dragdrop/drag_source.h"
+#include "ui/base/dragdrop/drop_target.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/drag_utils.h"
 #include "views/focus/focus_util_win.h"
 #include "views/widget/widget.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel
 
 namespace {
 
 // EditDropTarget is the IDropTarget implementation installed on
 // AutocompleteEditViewWin. EditDropTarget prefers URL over plain text. A drop
 // of a URL replaces all the text of the edit and navigates immediately to the
 // URL. A drop of plain text from the same edit either copies or moves the
 // selected text, and a drop of plain text from a source other than the edit
 // does a paste and go.
-class EditDropTarget : public app::win::DropTarget {
+class EditDropTarget : public ui::DropTarget {
  public:
   explicit EditDropTarget(AutocompleteEditViewWin* edit);
 
  protected:
   virtual DWORD OnDragEnter(IDataObject* data_object,
                             DWORD key_state,
                             POINT cursor_position,
                             DWORD effect);
   virtual DWORD OnDragOver(IDataObject* data_object,
                            DWORD key_state,
@@ skipping 30 matching lines @@
 // DROPEFFECTS.  We prefer copy over link.
 DWORD CopyOrLinkDropEffect(DWORD effect) {
   if (effect & DROPEFFECT_COPY)
     return DROPEFFECT_COPY;
   if (effect & DROPEFFECT_LINK)
     return DROPEFFECT_LINK;
   return DROPEFFECT_NONE;
 }
 
 EditDropTarget::EditDropTarget(AutocompleteEditViewWin* edit)
-    : app::win::DropTarget(edit->m_hWnd),
+    : ui::DropTarget(edit->m_hWnd),
       edit_(edit),
       drag_has_url_(false),
       drag_has_string_(false) {
 }
 
 DWORD EditDropTarget::OnDragEnter(IDataObject* data_object,
                                   DWORD key_state,
                                   POINT cursor_position,
                                   DWORD effect) {
   ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
@@ skipping 2287 matching lines @@
     UserMetrics::RecordAction(UserMetricsAction("Omnibox_DragURL"),
                               model_->profile());
   } else {
     supported_modes |= DROPEFFECT_MOVE;
     UserMetrics::RecordAction(UserMetricsAction("Omnibox_DragString"),
                               model_->profile());
   }
 
   data.SetString(text_to_write);
 
-  scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
+  scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
   DWORD dropped_mode;
   AutoReset<bool> auto_reset_in_drag(&in_drag_, true);
   if (DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
                  drag_source, supported_modes, &dropped_mode) ==
           DRAGDROP_S_DROP) {
     if ((dropped_mode == DROPEFFECT_MOVE) && (start_text == GetText())) {
       ScopedFreeze freeze(this, GetTextObjectModel());
       OnBeforePossibleChange();
       SetSelectionRange(sel);
       ReplaceSel(L"", true);
@@ skipping 119 matching lines @@
 }
 
 int AutocompleteEditViewWin::WidthNeededToDisplay(
     const std::wstring& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }