More const int definitions for VC++

ui/gfx/icon_util.cc

Index: ui/gfx/icon_util.cc
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index f9758d39f67626b02bf8a1f470ff8338452ed793..7ceb6edad62b5bd90cb5f0e74bd7f589b8bfe1b4 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

[danakj, 2015/10/30 20:40:37]

Why is this !defined || VER >= 1900, but the one in base is only checking VER >=
1900?

[brucedawson, 2015/10/30 20:51:37]

The one in base is in a _win only file. But, I don't actually like that
explanation. I can add the _MSC_VER check as well there.

+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.