ui/base/dragdrop/os_exchange_data.h - Issue 7977025: aura: Make 'ui' buildable without gtk.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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 »