Move BaseDropTarget and BaseDragSource from base to app/win. Remove the "Base...

chrome/browser/autocomplete/autocomplete_edit_view_win.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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
 #include <richedit.h>
 #include <textserv.h>
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
 #include "app/win_util.h"
+#include "app/win/drag_source.h"
+#include "app/win/drop_target.h"
 #include "app/win/iat_patch_function.h"
 #include "base/auto_reset.h"
-#include "base/base_drag_source.h"
-#include "base/base_drop_target.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_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_accessibility.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
@@ skipping 24 matching lines @@
 // 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 BaseDropTarget {
+class EditDropTarget : public app::win::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)
-    : BaseDropTarget(edit->m_hWnd),
+    : app::win::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) {
   OSExchangeData os_data(new OSExchangeDataProviderWin(data_object));
@@ skipping 2280 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<BaseDragSource> drag_source(new BaseDragSource);
+  scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
   DWORD dropped_mode;
   AutoReset<bool> auto_reset_in_drag(&in_drag_, true);
   if (DoDragDrop(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);
       OnAfterPossibleChange();
@@ skipping 117 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int AutocompleteEditViewWin::WidthNeededToDisplay(const std::wstring& text) {
   // 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();
 }