17 files changed, 69 insertions, 24 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index b324d64..31d21f0 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -6,11 +6,11 @@
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
-#include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
@@ -31,6 +31,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using ui::OSExchangeData;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index 234529e..0ccd4a5 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -18,7 +18,10 @@
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
 
+namespace ui {
 class OSExchangeData;
+}
+using ui::OSExchangeData;
 
 namespace views {
 
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index 8186a28..ec9b944 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -10,12 +10,14 @@
 #include <string>
 
 #include "app/drag_drop_types.h"
-#include "app/os_exchange_data.h"
 #include "base/logging.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/event.h"
 
+using ui::OSExchangeData;
+
 namespace views {
 
 class DropTargetEvent;
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index d249196..97cdb25 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -4,7 +4,6 @@
 
 #include "views/drag_utils.h"
 
-#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -13,8 +12,11 @@
 #include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/button/text_button.h"
 
+using ui::OSExchangeData;
+
 namespace drag_utils {
 
 // Maximum width of the link drag image in pixels.
diff --git a/views/drag_utils.h b/views/drag_utils.h
index a8dba30..020e6bd 100644
--- a/views/drag_utils.h
+++ b/views/drag_utils.h
@@ -10,14 +10,19 @@
 
 #include "base/file_path.h"
 
+class GURL;
+class SkBitmap;
+
 namespace gfx {
 class Canvas;
 class Point;
 class Size;
 }
-class GURL;
+
+namespace ui {
 class OSExchangeData;
-class SkBitmap;
+}
+using ui::OSExchangeData;
 
 namespace drag_utils {
 
diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc
index 8ab044b..c87d771 100644
--- a/views/drag_utils_gtk.cc
+++ b/views/drag_utils_gtk.cc
@@ -6,14 +6,17 @@
 
 #include <gtk/gtk.h>
 
-#include "app/os_exchange_data.h"
-#include "app/os_exchange_data_provider_gtk.h"
 #include "base/logging.h"
 #include "gfx/canvas.h"
 #include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "gfx/size.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_gtk.h"
+
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderGtk;
 
 namespace drag_utils {
 
diff --git a/views/drag_utils_win.cc b/views/drag_utils_win.cc
index d21d37f..2a467b8 100644
--- a/views/drag_utils_win.cc
+++ b/views/drag_utils_win.cc
@@ -8,12 +8,15 @@
 #include <shlobj.h>
 #include <shobjidl.h>
 
-#include "app/os_exchange_data.h"
-#include "app/os_exchange_data_provider_win.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/gdi_util.h"
 #include "gfx/skbitmap_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderWin;
 
 namespace drag_utils {
 
diff --git a/views/event.h b/views/event.h
index 1ce8b9a..b1760b9 100644
--- a/views/event.h
+++ b/views/event.h
@@ -18,7 +18,10 @@ typedef struct _GdkEventKey GdkEventKey;
 typedef union _XEvent XEvent;
 #endif
 
+namespace ui {
 class OSExchangeData;
+}
+using ui::OSExchangeData;
 
 namespace views {
 
diff --git a/views/view.h b/views/view.h
index 895e097..6b0f56c 100644
--- a/views/view.h
+++ b/views/view.h
@@ -14,16 +14,18 @@
 #include <string>
 #include <vector>
 
-#include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
 #include "base/scoped_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/accelerator.h"
 #include "views/accessibility/accessibility_types.h"
 #include "views/background.h"
 #include "views/border.h"
 
+using ui::OSExchangeData;
+
 namespace gfx {
 class Canvas;
 class Insets;
diff --git a/views/views.gyp b/views/views.gyp
index 9e67f12..b8d75f9 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -52,7 +52,6 @@
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/ui.gyp:ui_base',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
diff --git a/views/widget/drop_helper.h b/views/widget/drop_helper.h
index 28c9c8f..453a04e 100644
--- a/views/widget/drop_helper.h
+++ b/views/widget/drop_helper.h
@@ -8,12 +8,15 @@
 
 #include "base/basictypes.h"
 
-class OSExchangeData;
-
 namespace gfx {
 class Point;
 }  // namespace gfx
 
+namespace ui {
+class OSExchangeData;
+}  // namespace ui
+using ui::OSExchangeData;
+
 namespace views {
 
 class RootView;
diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc
index 8a68db8..75468ec 100644
--- a/views/widget/drop_target_gtk.cc
+++ b/views/widget/drop_target_gtk.cc
@@ -11,14 +11,16 @@
 
 #include "app/drag_drop_types.h"
 #include "app/gtk_dnd_util.h"
-#include "app/os_exchange_data_provider_gtk.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/point.h"
 #include "net/base/net_util.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
+using ui::OSExchangeData;
+
 namespace {
 
 std::string GdkAtomToString(GdkAtom atom) {
diff --git a/views/widget/drop_target_gtk.h b/views/widget/drop_target_gtk.h
index d9cb011..0a3923f 100644
--- a/views/widget/drop_target_gtk.h
+++ b/views/widget/drop_target_gtk.h
@@ -9,11 +9,15 @@
 #include <gtk/gtk.h>
 #include <set>
 
-#include "app/os_exchange_data.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/widget/drop_helper.h"
 
+namespace ui {
 class OSExchangeDataProviderGtk;
+}
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderGtk;
 
 namespace views {
 
diff --git a/views/widget/drop_target_win.cc b/views/widget/drop_target_win.cc
index e4d1069..eb5151d 100644
--- a/views/widget/drop_target_win.cc
+++ b/views/widget/drop_target_win.cc
@@ -5,12 +5,15 @@
 #include "views/widget/drop_target_win.h"
 
 #include "app/drag_drop_types.h"
-#include "app/os_exchange_data.h"
-#include "app/os_exchange_data_provider_win.h"
 #include "gfx/point.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderWin;
+
 namespace views {
 
 DropTargetWin::DropTargetWin(RootView* root_view)
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index 5f4a088..714afc2 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -5,10 +5,13 @@
 #include "views/widget/root_view.h"
 
 #include "app/drag_drop_types.h"
-#include "app/os_exchange_data.h"
-#include "app/os_exchange_data_provider_win.h"
 #include "app/win/drag_source.h"
 #include "gfx/canvas_skia.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderWin;
 
 namespace views {
 
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 6520fea..6eb3706 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "app/drag_drop_types.h"
-#include "app/os_exchange_data.h"
-#include "app/os_exchange_data_provider_gtk.h"
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/path.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
@@ -29,6 +29,9 @@
 #include "views/widget/widget_utils.h"
 #include "views/window/window_gtk.h"
 
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderGtk;
+
 namespace {
 
 // g_object data keys to associate a WidgetGtk object to a GtkWidget.
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index a8a2947..77f9c97 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -15,13 +15,17 @@
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
-class OSExchangeData;
-class OSExchangeDataProviderGtk;
-
 namespace gfx {
 class Rect;
 }
 
+namespace ui {
+class OSExchangeData;
+class OSExchangeDataProviderGtk;
+}
+using ui::OSExchangeData;
+using ui::OSExchangeDataProviderGtk;
+
 namespace views {
 
 class DefaultThemeProvider;