| 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_
 | 
| 
 |