Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1082)

Unified Diff: chrome/browser/download/download_util.cc

Issue 6200005: Move OSExchangeData from src/app to src/ui/base/dragdrop... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/download_util.cc
===================================================================
--- chrome/browser/download/download_util.cc (revision 71050)
+++ chrome/browser/download/download_util.cc (working copy)
@@ -56,7 +56,7 @@
#include "third_party/skia/include/core/SkShader.h"
#if defined(TOOLKIT_VIEWS)
-#include "app/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
#include "views/drag_utils.h"
#endif
@@ -70,12 +70,12 @@
#endif // defined(TOOLKIT_USES_GTK)
#if defined(OS_WIN)
-#include "app/os_exchange_data_provider_win.h"
#include "app/win/drag_source.h"
#include "app/win/win_util.h"
#include "base/win/scoped_comptr.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
#endif
namespace download_util {
@@ -469,7 +469,7 @@
DCHECK(download);
// Set up our OLE machinery
- OSExchangeData data;
+ ui::OSExchangeData data;
if (icon) {
drag_utils::CreateDragImageForFile(
@@ -494,8 +494,8 @@
// Run the drag and drop loop
DWORD effects;
- DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source.get(),
- DROPEFFECT_COPY | DROPEFFECT_LINK, &effects);
+ DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
+ drag_source.get(), DROPEFFECT_COPY | DROPEFFECT_LINK, &effects);
#elif defined(TOOLKIT_USES_GTK)
GtkWidget* root = gtk_widget_get_toplevel(view);
if (!root)
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698