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

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

Issue 7977025: aura: Make 'ui' buildable without gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/base/l10n/l10n_util.cc » ('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
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index 7de4e57c00a1a45f42f53b8ccb2e633298844880..9888b3f8510d0d617e2001c36f618f11c06c7638 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -13,7 +13,7 @@
#if defined(OS_WIN)
#include <objidl.h>
-#elif !defined(OS_MACOSX)
+#elif defined(TOOLKIT_USES_GTK)
#include <gtk/gtk.h>
#endif
@@ -48,8 +48,10 @@ class UI_EXPORT OSExchangeData {
// nodes are written using a CustomFormat.
#if defined(OS_WIN)
typedef CLIPFORMAT CustomFormat;
-#elif !defined(OS_MACOSX)
+#elif defined(TOOLKIT_USES_GTK)
typedef GdkAtom CustomFormat;
+#else
+ typedef void* CustomFormat;
#endif
// Enumeration of the known formats.
« no previous file with comments | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698