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

chrome/browser/ui/views/bookmark_menu_controller_views.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/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"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/ui/views/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/common/page_transition_types.h"
 #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;
 
 // Max width of a menu. There does not appear to be an OS value for this, yet
 // both IE and FF restrict the max width of a menu.
 static const int kMaxMenuWidth = 400;
 
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                Profile* profile,
@@ skipping 67 matching lines @@
   WindowOpenDisposition initial_disposition =
       event_utils::DispositionFromEventFlags(mouse_event_flags);
 
   bookmark_utils::OpenAll(parent_, profile_, page_navigator_, selection,
                           initial_disposition);
 }
 
 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;
 }
 
 bool BookmarkMenuController::AreDropTypesRequired(MenuItemView* menu) {
   return true;
 }
 
 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.
 
   if (!drop_data_.Read(data) || drop_data_.elements.size() != 1)
     return false;
 
   if (drop_data_.has_single_url())
     return true;
 
   const BookmarkNode* drag_node = drop_data_.GetFirstNode(profile_);
@@ skipping 79 matching lines @@
 
 void BookmarkMenuController::DropMenuClosed(MenuItemView* menu) {
   delete this;
 }
 
 bool BookmarkMenuController::CanDrag(MenuItemView* menu) {
   return true;
 }
 
 void BookmarkMenuController::WriteDragData(MenuItemView* sender,
-                                           OSExchangeData* data) {
+                                           ui::OSExchangeData* data) {
   DCHECK(sender && data);
 
   UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"),
                             profile_);
 
   BookmarkNodeData drag_data(menu_id_to_node_map_[sender->GetCommand()]);
   drag_data.Write(profile_, data);
 }
 
 int BookmarkMenuController::GetDragOperations(MenuItemView* sender) {
@@ skipping 174 matching lines @@
         break;
       }
     }
     if (ancestor_removed) {
       node_to_menu_id_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }