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

Unified Diff: views/widget/root_view_win.cc

Issue 6250014: Move more dnd related files to ui/base (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
« no previous file with comments | « views/widget/root_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/root_view_win.cc
===================================================================
--- views/widget/root_view_win.cc (revision 71798)
+++ views/widget/root_view_win.cc (working copy)
@@ -4,9 +4,9 @@
#include "views/widget/root_view.h"
-#include "app/drag_drop_types.h"
-#include "app/win/drag_source.h"
#include "gfx/canvas_skia.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/drag_source.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
@@ -41,10 +41,10 @@
int operation) {
// NOTE: view may be null.
drag_view_ = view;
- scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
+ scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
DWORD effects;
DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source,
- DragDropTypes::DragOperationToDropEffect(operation), &effects);
+ ui::DragDropTypes::DragOperationToDropEffect(operation), &effects);
// If the view is removed during the drag operation, drag_view_ is set to
// NULL.
if (view && drag_view_ == view) {
« no previous file with comments | « views/widget/root_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698