Add support for multi resolution icons

ui/gfx/image.h

Index: ui/gfx/image.h
diff --git a/ui/gfx/image.h b/ui/gfx/image.h
index fddf4da27eb98ca4f11a95dd90b59a8125c9ff9f..69117ffc39977a6b0980e614065dd0bf6f59a7d3 100644
--- a/ui/gfx/image.h
+++ b/ui/gfx/image.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include <map>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
@@ -25,6 +26,7 @@ class SkBitmap;
 
 namespace {
 class ImageTest;
+class ImageMacTest;
 }
 
 namespace gfx {
@@ -44,11 +46,17 @@ class Image {
   // Creates a new image with the default representation. The object will take
   // ownership of the image.
   explicit Image(const SkBitmap* bitmap);
+  // To create an Image that supports multiple resolutions pass a vector
+  // of bitmaps, one for each resolution.
+  explicit Image(const std::vector<const SkBitmap*>& bitmaps);
+
 #if defined(OS_LINUX)
   // Does not increase |pixbuf|'s reference count; expects to take ownership.
   explicit Image(GdkPixbuf* pixbuf);
 #elif defined(OS_MACOSX)
   // Does not retain |image|; expects to take ownership.
+  // A single NSImage object can contain multiple bitmaps so there's no reason
+  // to pass a vector of these.
   explicit Image(NSImage* image);
 #endif
 
@@ -64,6 +72,16 @@ class Image {
   operator NSImage*();
 #endif
 
+  // Gets the number of bitmaps in this image. This may cause a conversion
+  // to a bitmap representation. Note, this function and GetSkBitmapAtIndex()
+  // are primarily meant to be used by the theme provider.
+  size_t GetNumberOfSkBitmaps();
+
+  // Gets the bitmap at the given index. This may cause a conversion
+  // to a bitmap representation. Note, the internal ordering of bitmaps is not
+  // guaranteed.
+  const SkBitmap* GetSkBitmapAtIndex(size_t index);
+
   // Inspects the representations map to see if the given type exists.
   bool HasRepresentation(RepresentationType type);
 
@@ -92,6 +110,7 @@ class Image {
   RepresentationMap representations_;
 
   friend class ::ImageTest;
+  friend class ::ImageMacTest;
   DISALLOW_COPY_AND_ASSIGN(Image);
 };