Add support for multi resolution icons

chrome/browser/themes/browser_theme_pack.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 57 matching lines @@
   bool GetTint(int id, color_utils::HSL* hsl) const;
   bool GetColor(int id, SkColor* color) const;
   bool GetDisplayProperty(int id, int* result) const;
 
   // Returns a bitmap if we have a custom image for |id|, otherwise NULL. Note
   // that this is separate from HasCustomImage() which returns whether a custom
   // image |id| was included in the unprocessed theme and is used as a proxy
   // for making layout decisions in the interface.
   SkBitmap* GetBitmapNamed(int id) const;
 
+  // Get bitmaps for the given |id|. This can be used for icons rendered at
+  // multiple resolutions.
+  bool GetBitmapsNamed(int id, std::vector<SkBitmap*>& bitmaps) const;

[Nico, 2011/04/14 18:28:54]

Introduce a new class and have this return that. e.g. MultiresolutionImage or
some such. The new class would have methods like GetBitmapForResolution() on win
and elsewhere and a ToNSImage() on mac. That way, the mac code doesn't have to
convert to SkBitmaps

[Robert Sesek, 2011/04/14 18:42:44]

If I'm understanding correctly, this is exactly what gfx::Image is for.

+
   // Returns the raw PNG encoded data for IDR_THEME_NTP_*. This method is only
   // supposed to work for the NTP attribution and background resources.
   RefCountedMemory* GetRawData(int id) const;
 
   // Whether this theme provides an image for |id|.
   bool HasCustomImage(int id) const;
 
  private:
   friend struct BrowserThread::DeleteOnThread<BrowserThread::FILE>;
   friend class DeleteTask<BrowserThemePack>;
   friend class BrowserThemePackTest;
 
   // Cached images. We cache all retrieved and generated bitmaps and keep
   // track of the pointers. We own these and will delete them when we're done
   // using them.
   typedef std::map<int, SkBitmap*> ImageCache;
+  typedef std::map<int, std::vector<SkBitmap*>* > MultiResImageCache;
 
   // The raw PNG memory associated with a certain id.
   typedef std::map<int, scoped_refptr<RefCountedMemory> > RawImages;
 
   // The type passed to base::DataPack::WritePack.
   typedef std::map<uint32, base::StringPiece> RawDataForWriting;
 
   // An association between an id and the FilePath that has the image data.
   typedef std::map<int, FilePath> FilePathMap;
 
@@ skipping 115 matching lines @@
   RawImages image_memory_;
 
   // An immutable cache of images generated in BuildFromExtension(). When this
   // BrowserThemePack is generated from BuildFromDataPack(), this cache is
   // empty. We separate the images from the images loaded from disk so that
   // WriteToDisk()'s implementation doesn't need locks. There should be no IDs
   // in |image_memory_| that are in |prepared_images_| or vice versa.
   ImageCache prepared_images_;
 
   // Loaded images. These are loaded from |image_memory_| or the |data_pack_|.
-  mutable ImageCache loaded_images_;
+  mutable MultiResImageCache loaded_images_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemePack);
 };
 
 #endif  // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_