diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:52:54 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:52:54 +0000 |
| commit | b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (patch) | |
| tree | 91131329313e02e6c171e007707ab1cb0c3c2be0 /ui/base/dragdrop | |
| parent | 694cafac21aee4a18638d5dfb0e726d3f237be3d (diff) | |
| download | chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.zip chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.tar.gz chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.tar.bz2 | |
aura: Make 'ui' buildable without gtk.
BUG=97131
TEST=ui_unittests links and runs with use_aura=1
Review URL: http://codereview.chromium.org/7977025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/dragdrop')
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h index 7de4e57..9888b3f 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. |