Index: ui/views/drag_utils_win.cc |
diff --git a/views/drag_utils_win.cc b/ui/views/drag_utils_win.cc |
similarity index 91% |
rename from views/drag_utils_win.cc |
rename to ui/views/drag_utils_win.cc |
index 07905cbf43edebee28ef938cc1aafbfd3b53c4d1..3295f8ff3d00d6972b8c7f6cb3c412436d8aab1b 100644 |
--- a/views/drag_utils_win.cc |
+++ b/ui/views/drag_utils_win.cc |
@@ -2,23 +2,20 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "views/drag_utils.h" |
+#include "ui/views/drag_utils.h" |
#include <objidl.h> |
#include <shlobj.h> |
#include <shobjidl.h> |
#include "base/win/scoped_comptr.h" |
-#include "ui/base/dragdrop/os_exchange_data.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
+#include "ui/base/dragdrop/os_exchange_data.h" |
#include "ui/base/dragdrop/os_exchange_data_provider_win.h" |
#include "ui/gfx/canvas_skia.h" |
#include "ui/gfx/gdi_util.h" |
#include "ui/gfx/skbitmap_operations.h" |
-using ui::OSExchangeData; |
-using ui::OSExchangeDataProviderWin; |
- |
namespace drag_utils { |
static void SetDragImageOnDataObject(HBITMAP hbitmap, |
@@ -59,7 +56,7 @@ static HBITMAP CreateHBITMAPFromSkBitmap(const SkBitmap& sk_bitmap) { |
void SetDragImageOnDataObject(const SkBitmap& sk_bitmap, |
const gfx::Size& size, |
const gfx::Point& cursor_offset, |
- OSExchangeData* data_object) { |
+ ui::OSExchangeData* data_object) { |
DCHECK(data_object && !size.IsEmpty()); |
// InitializeFromBitmap() doesn't expect an alpha channel and is confused |
// by premultiplied colors, so unpremultiply the bitmap. |
@@ -69,7 +66,7 @@ void SetDragImageOnDataObject(const SkBitmap& sk_bitmap, |
// Attach 'bitmap' to the data_object. |
SetDragImageOnDataObject(bitmap, size, cursor_offset, |
- OSExchangeDataProviderWin::GetIDataObject(*data_object)); |
+ ui::OSExchangeDataProviderWin::GetIDataObject(*data_object)); |
} |
-} // namespace drag_utils |
+} // namespace drag_utils |