ui/base/clipboard/custom_data_helper.h - Issue 110283005: Make aura_demo work on Mac

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/clipboard/custom_data_helper.h

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix resolve Created 6 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:

Index: ui/base/clipboard/custom_data_helper.h

diff --git a/ui/base/clipboard/custom_data_helper.h b/ui/base/clipboard/custom_data_helper.h

index 9ca70653c4bd82c7a342db34215faaf82fc3345c..47e7f6a0447f9528b4b069fdb6f5d9fdb6d9deb5 100644

--- a/ui/base/clipboard/custom_data_helper.h

+++ b/ui/base/clipboard/custom_data_helper.h

@@ -28,7 +28,7 @@ class NSString;

namespace ui {

-#if defined(OS_MACOSX)

+#if defined(OS_MACOSX) && !defined(USE_AURA)

UI_BASE_EXPORT extern NSString* const kWebCustomDataPboardType;

#elif (!defined(OS_WIN) && defined(USE_AURA)) || defined(TOOLKIT_GTK)

UI_BASE_EXPORT extern const char kMimeTypeWebCustomData[];

« no previous file with comments | « ui/base/clipboard/clipboard_aura.cc ('k') | ui/base/clipboard/custom_data_helper_mac.mm » ('j') | no next file with comments »