| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ | 5 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ |
| 6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ | 6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ |
| 7 | 7 |
| 8 #include <ApplicationServices/ApplicationServices.h> | 8 #include <ApplicationServices/ApplicationServices.h> |
| 9 | 9 |
| 10 #include "ui/base/ui_export.h" | 10 #include "ui/gfx/gfx_export.h" |
| 11 | 11 |
| 12 #ifdef __LP64__ | 12 #ifdef __LP64__ |
| 13 typedef CGSize NSSize; | 13 typedef CGSize NSSize; |
| 14 #else | 14 #else |
| 15 typedef struct _NSSize NSSize; | 15 typedef struct _NSSize NSSize; |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 #ifdef __OBJC__ | 18 #ifdef __OBJC__ |
| 19 @class NSImage; | 19 @class NSImage; |
| 20 #else | 20 #else |
| (...skipping 18 matching lines...) Expand all Loading... |
| 39 UI_EXPORT NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia); | 39 UI_EXPORT NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia); |
| 40 | 40 |
| 41 // Converts to NSImage from given ImageSkia and a color space. | 41 // Converts to NSImage from given ImageSkia and a color space. |
| 42 UI_EXPORT NSImage* NSImageFromImageSkiaWithColorSpace( | 42 UI_EXPORT NSImage* NSImageFromImageSkiaWithColorSpace( |
| 43 const gfx::ImageSkia& image_skia, | 43 const gfx::ImageSkia& image_skia, |
| 44 CGColorSpaceRef color_space); | 44 CGColorSpaceRef color_space); |
| 45 | 45 |
| 46 } // namespace gfx | 46 } // namespace gfx |
| 47 | 47 |
| 48 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ | 48 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ |
| OLD | NEW |