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

Unified Diff: ui/gfx/gfx_export.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 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/gfx/animation/tween.cc ('k') | ui/gfx/interpolated_transform.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx_export.h
diff --git a/ui/gfx/gfx_export.h b/ui/gfx/gfx_export.h
index d99a995696500f562a063d479c8f529139845eac..f610d98d82d7995eb6cf24d5d61197715372d95b 100644
--- a/ui/gfx/gfx_export.h
+++ b/ui/gfx/gfx_export.h
@@ -5,9 +5,29 @@
#ifndef UI_GFX_GFX_EXPORT_H_
#define UI_GFX_GFX_EXPORT_H_
-// TODO(beng): put in normal export #defines once gfx dependencies have been
-// corrected.
+// TODO(beng): remove include once gfx dependencies have been corrected.
#include "ui/base/ui_export.h"
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+
+#if defined(UI_IMPLEMENTATION)
+#define GFX_EXPORT __declspec(dllexport)
+#else
+#define GFX_EXPORT __declspec(dllimport)
+#endif // defined(UI_IMPLEMENTATION)
+
+#else // defined(WIN32)
+#if defined(UI_IMPLEMENTATION)
+#define GFX_EXPORT __attribute__((visibility("default")))
+#else
+#define GFX_EXPORT
+#endif
+#endif
+
+#else // defined(COMPONENT_BUILD)
+#define GFX_EXPORT
+#endif
+
#endif // UI_GFX_GFX_EXPORT_H_
« no previous file with comments | « ui/gfx/animation/tween.cc ('k') | ui/gfx/interpolated_transform.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698