Move OSExchangeData from src/app to src/ui/base/dragdrop...

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/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/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"
@@ skipping 14 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/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.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
 
@@ skipping 59 matching lines @@
     : 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));
+  ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
   drag_has_url_ = os_data.HasURL();
   drag_has_string_ = !drag_has_url_ && os_data.HasString();
   if (drag_has_url_) {
     if (edit_->in_drag()) {
       // The edit we're associated with originated the drag. No point in
       // allowing the user to drop back on us.
       drag_has_url_ = false;
     }
     // NOTE: it would be nice to visually show all the text is going to
     // be replaced by selecting all, but this caused painting problems. In
@@ skipping 29 matching lines @@
 }
 
 void EditDropTarget::OnDragLeave(IDataObject* data_object) {
   ResetDropHighlights();
 }
 
 DWORD EditDropTarget::OnDrop(IDataObject* data_object,
                              DWORD key_state,
                              POINT cursor_position,
                              DWORD effect) {
-  OSExchangeData os_data(new OSExchangeDataProviderWin(data_object));
+  ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
 
   if (drag_has_url_) {
     GURL url;
     std::wstring title;
     if (os_data.GetURLAndTitle(&url, &title)) {
       edit_->SetUserText(UTF8ToWide(url.spec()));
       edit_->model()->AcceptInput(CURRENT_TAB, true);
       return CopyOrLinkDropEffect(effect);
     }
   } else if (drag_has_string_) {
@@ skipping 2218 matching lines @@
           reinterpret_cast<void**>(&text_object_model_));
     }
   }
   return text_object_model_;
 }
 
 void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) {
   if (initiated_drag_ || !app::win::IsDrag(click_point_[kLeft], point))
     return;
 
-  OSExchangeData data;
+  ui::OSExchangeData data;
 
   DWORD supported_modes = DROPEFFECT_COPY;
 
   CHARRANGE sel;
   GetSelection(sel);
 
   // We're about to start a drag session, but the edit is expecting a mouse up
   // that it uses to reset internal state.  If we don't send a mouse up now,
   // when the mouse moves back into the edit the edit will reset the selection.
   // So, we send the event now which resets the selection.  We then restore the
@@ skipping 31 matching lines @@
     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);
   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 (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);
       OnAfterPossibleChange();
     }
     // else case, not a move or it was a move and the drop was on us.
     // If the drop was on us, EditDropTarget took care of the move so that
     // we don't have to delete the text.
@@ skipping 124 matching lines @@
 
 bool AutocompleteEditViewWin::IsImeComposing() const {
   bool ime_composing = false;
   HIMC context = ImmGetContext(m_hWnd);
   if (context) {
     ime_composing = !!ImmGetCompositionString(context, GCS_COMPSTR, NULL, 0);
     ImmReleaseContext(m_hWnd, context);
   }
   return ime_composing;
 }