Index: ui/gfx/icon_util.cc |
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc |
index f9758d39f67626b02bf8a1f470ff8338452ed793..62d43e55f15abfc3300301e1fce19f8719859c0a 100644 |
--- a/ui/gfx/icon_util.cc |
+++ b/ui/gfx/icon_util.cc |
@@ -163,6 +163,12 @@ const int IconUtil::kIconDimensions[] = { |
const size_t IconUtil::kNumIconDimensions = arraysize(kIconDimensions); |
const size_t IconUtil::kNumIconDimensionsUpToMediumSize = 9; |
+// VS 2015 and above allow these definitions and in this case require them |
+#if !defined(_MSC_VER) || _MSC_VER >= 1900 |
+const int IconUtil::kLargeIconSize; |
+const int IconUtil::kMediumIconSize; |
+#endif |
+ |
HICON IconUtil::CreateHICONFromSkBitmap(const SkBitmap& bitmap) { |
// Only 32 bit ARGB bitmaps are supported. We also try to perform as many |
// validations as we can on the bitmap. |