Add support for multi resolution icons

ui/gfx/image_unittest.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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #ifndef UI_GFX_IMAGE_UNITTEST_H_
 #define UI_GFX_IMAGE_UNITTEST_H_
 
@@ skipping 12 matching lines @@
 namespace test {
 
 #if defined(OS_MACOSX)
 typedef NSImage* PlatformImage;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
 typedef GdkPixbuf* PlatformImage;
 #else
 typedef const SkBitmap* PlatformImage;
 #endif
 
-SkBitmap* CreateBitmap() {
+inline SkBitmap* CreateBitmap(int width, int height) {

[Robert Sesek, 2011/04/19 02:41:41]

just curious: why inline?

[sail, 2011/04/19 04:56:59]

This function is being included by image_unittest.cc as well. This caused the
linker to complain that the symbol was defined multiple times.

I wanted to use static but that threw another error about not all the functions
being used.

   SkBitmap* bitmap = new SkBitmap();
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config, 25, 25);
+  bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap->allocPixels();
   bitmap->eraseRGB(255, 0, 0);
   return bitmap;
 }
 
-PlatformImage CreatePlatformImage() {
-  scoped_ptr<SkBitmap> bitmap(CreateBitmap());
+inline PlatformImage CreatePlatformImage() {
+  scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25));
 #if defined(OS_MACOSX)
   NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get()));
   base::mac::NSObjectRetain(image);
   return image;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   return gfx::GdkPixbufFromSkBitmap(bitmap.get());
 #else
   return bitmap.release();
 #endif
 }
 
-gfx::Image::RepresentationType GetPlatformRepresentationType() {
+inline gfx::Image::RepresentationType GetPlatformRepresentationType() {
 #if defined(OS_MACOSX)
   return gfx::Image::kNSImageRep;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   return gfx::Image::kGdkPixbufRep;
 #else
   return gfx::Image::kSkBitmapRep;
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_UNITTEST_H_