Index: chrome/browser/ui/views/bookmark_menu_controller_views.cc |
=================================================================== |
--- chrome/browser/ui/views/bookmark_menu_controller_views.cc (revision 71050) |
+++ chrome/browser/ui/views/bookmark_menu_controller_views.cc (working copy) |
@@ -4,7 +4,6 @@ |
#include "chrome/browser/ui/views/bookmark_menu_controller_views.h" |
-#include "app/os_exchange_data.h" |
#include "app/resource_bundle.h" |
#include "base/stl_util-inl.h" |
#include "base/utf_string_conversions.h" |
@@ -20,6 +19,7 @@ |
#include "grit/app_resources.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
+#include "ui/base/dragdrop/os_exchange_data.h" |
#include "views/controls/button/menu_button.h" |
using views::MenuItemView; |
@@ -107,8 +107,8 @@ |
bool BookmarkMenuController::GetDropFormats( |
MenuItemView* menu, |
int* formats, |
- std::set<OSExchangeData::CustomFormat>* custom_formats) { |
- *formats = OSExchangeData::URL; |
+ std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { |
+ *formats = ui::OSExchangeData::URL; |
custom_formats->insert(BookmarkNodeData::GetBookmarkCustomFormat()); |
return true; |
} |
@@ -118,7 +118,7 @@ |
} |
bool BookmarkMenuController::CanDrop(MenuItemView* menu, |
- const OSExchangeData& data) { |
+ const ui::OSExchangeData& data) { |
// Only accept drops of 1 node, which is the case for all data dragged from |
// bookmark bar and menus. |
@@ -218,7 +218,7 @@ |
} |
void BookmarkMenuController::WriteDragData(MenuItemView* sender, |
- OSExchangeData* data) { |
+ ui::OSExchangeData* data) { |
DCHECK(sender && data); |
UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"), |