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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 7 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
« chrome/chrome_browser_ui.gypi ('K') | « ui/base/clipboard/clipboard_aura.cc ('k') | ui/base/clipboard/custom_data_helper_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 55e7dce382984d28971b1480d58b341859625a42..745e2b3635a8104c8c67f848833776278ba08020 100644
--- a/ui/base/clipboard/custom_data_helper.h
+++ b/ui/base/clipboard/custom_data_helper.h
@@ -28,10 +28,10 @@ class NSString;
namespace ui {
-#if defined(OS_MACOSX)
-UI_EXPORT extern NSString* const kWebCustomDataPboardType;
-#elif (!defined(OS_WIN) && defined(USE_AURA)) || defined(TOOLKIT_GTK)
+#if defined(USE_AURA) && !defined(OS_WIN)
UI_EXPORT extern const char kMimeTypeWebCustomData[];
+#elif defined(OS_MACOSX)
+UI_EXPORT extern NSString* const kWebCustomDataPboardType;
#endif
UI_EXPORT void ReadCustomDataTypes(const void* data,
« chrome/chrome_browser_ui.gypi ('K') | « ui/base/clipboard/clipboard_aura.cc ('k') | ui/base/clipboard/custom_data_helper_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698