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

Unified Diff: ui/base/dragdrop/os_exchange_data.h

Issue 11444013: Get drag and drop working for win aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 8 years 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 | « ui/aura/ui_controls_win.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/os_exchange_data.h
===================================================================
--- ui/base/dragdrop/os_exchange_data.h (revision 171879)
+++ ui/base/dragdrop/os_exchange_data.h (working copy)
@@ -49,12 +49,12 @@
public:
// CustomFormats are used for non-standard data types. For example, bookmark
// nodes are written using a CustomFormat.
-#if defined(USE_AURA)
+#if defined(OS_WIN)
+ typedef CLIPFORMAT CustomFormat;
+#elif defined(USE_AURA)
// Use the same type as the clipboard (why do we want two different
// definitions of this on other platforms?).
typedef Clipboard::FormatType CustomFormat;
-#elif defined(OS_WIN)
- typedef CLIPFORMAT CustomFormat;
#elif defined(TOOLKIT_GTK)
typedef GdkAtom CustomFormat;
#else
@@ -139,6 +139,9 @@
#endif
};
+ // Creates the platform specific Provider.
+ static Provider* CreateProvider();
+
OSExchangeData();
// Creates an OSExchangeData with the specified provider. OSExchangeData
// takes ownership of the supplied provider.
@@ -222,9 +225,6 @@
#endif
private:
- // Creates the platform specific Provider.
- static Provider* CreateProvider();
-
// Provides the actual data.
scoped_ptr<Provider> provider_;
« no previous file with comments | « ui/aura/ui_controls_win.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698