summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 04:51:07 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 04:51:07 +0000
commit507bad5377a236f93f8ec190ca4354dd3cb47b39 (patch)
tree690a510a35e4b1d41eba5948c2d9e78044b6a7fb /ui/gfx/image
parent843ccb24f7b092580c48cf659865def0758ed976 (diff)
downloadchromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.zip
chromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.tar.gz
chromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.tar.bz2
Rename UI_API to UI_EXPORT.
R=rvargas@chromium.org Review URL: http://codereview.chromium.org/7569005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image')
-rw-r--r--ui/gfx/image/image.h4
-rw-r--r--ui/gfx/image/image_util.h14
2 files changed, 9 insertions, 9 deletions
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index 6f6d161..c9aff41 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -23,8 +23,8 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
+#include "ui/base/ui_export.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/ui_api.h"
class SkBitmap;
@@ -40,7 +40,7 @@ class ImageRep;
class ImageStorage;
}
-class UI_API Image {
+class UI_EXPORT Image {
public:
enum RepresentationType {
kImageRepGdk,
diff --git a/ui/gfx/image/image_util.h b/ui/gfx/image/image_util.h
index 6e1d803..92f9224 100644
--- a/ui/gfx/image/image_util.h
+++ b/ui/gfx/image/image_util.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace gfx {
class Image;
@@ -19,18 +19,18 @@ namespace gfx {
// Creates an image from the given PNG-encoded input. The caller owns the
// returned Image. If there was an error creating the image, returns NULL.
-UI_API Image* ImageFromPNGEncodedData(const unsigned char* input,
- size_t input_size);
+UI_EXPORT Image* ImageFromPNGEncodedData(const unsigned char* input,
+ size_t input_size);
// Fills the |dst| vector with PNG-encoded bytes based on the given Image.
// Returns true if the Image was encoded successfully.
-UI_API bool PNGEncodedDataFromImage(const Image& image,
- std::vector<unsigned char>* dst);
+UI_EXPORT bool PNGEncodedDataFromImage(const Image& image,
+ std::vector<unsigned char>* dst);
// Fills the |dst| vector with JPEG-encoded bytes based on the given Image.
// Returns true if the Image was encoded successfully.
-UI_API bool JPEGEncodedDataFromImage(const Image& image,
- std::vector<unsigned char>* dst);
+UI_EXPORT bool JPEGEncodedDataFromImage(const Image& image,
+ std::vector<unsigned char>* dst);
}