summaryrefslogtreecommitdiff
path: root/chromium/ui/base/models/image_model.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/base/models/image_model.h')
-rw-r--r--chromium/ui/base/models/image_model.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/ui/base/models/image_model.h b/chromium/ui/base/models/image_model.h
index 098a92ed42d..dbc4cf8b01d 100644
--- a/chromium/ui/base/models/image_model.h
+++ b/chromium/ui/base/models/image_model.h
@@ -6,9 +6,9 @@
#define UI_BASE_MODELS_IMAGE_MODEL_H_
#include "base/callback.h"
+#include "base/component_export.h"
#include "base/optional.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_base_export.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
@@ -28,7 +28,7 @@ namespace ui {
// is only used internal to ImageModel and should never be instantiated except
// by ImageModel.
-class UI_BASE_EXPORT VectorIconModel {
+class COMPONENT_EXPORT(UI_BASE) VectorIconModel {
public:
VectorIconModel();
VectorIconModel(const VectorIconModel&);
@@ -71,7 +71,7 @@ class UI_BASE_EXPORT VectorIconModel {
// of the two may be specified at a given time. This class is instantiated via
// the FromXXXX static factory functions.
-class UI_BASE_EXPORT ImageModel {
+class COMPONENT_EXPORT(UI_BASE) ImageModel {
public:
ImageModel();
ImageModel(const ImageModel&);
@@ -92,6 +92,7 @@ class UI_BASE_EXPORT ImageModel {
bool IsEmpty() const;
bool IsVectorIcon() const;
bool IsImage() const;
+ gfx::Size Size() const;
// Only valid if IsVectorIcon() or IsImage() return true, respectively.
const VectorIconModel GetVectorIcon() const;
const gfx::Image GetImage() const;