Add support for multi resolution icons

ui/base/resource/resource_bundle.cc

 // 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.
 
 #include "ui/base/resource/resource_bundle.h"
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
@@ skipping 101 matching lines @@
   // Check to see if the image is already in the cache.
   {
     base::AutoLock lock_scope(*lock_);
     ImageMap::const_iterator found = images_.find(resource_id);
     if (found != images_.end())
       return *found->second;
   }
 
   scoped_ptr<SkBitmap> bitmap(LoadBitmap(resources_data_, resource_id));
   if (bitmap.get()) {
+    // Check if there's a large version of the image as well.
+    scoped_ptr<SkBitmap> large_bitmap;
+    if (large_icon_resources_data_)
+      large_bitmap.reset(LoadBitmap(large_icon_resources_data_, resource_id));
+
     // The load was successful, so cache the image.
     base::AutoLock lock_scope(*lock_);
 
     // Another thread raced the load and has already cached the image.
     if (images_.count(resource_id))
       return *images_[resource_id];
 
-    gfx::Image* image = new gfx::Image(bitmap.release());
+    std::vector<const SkBitmap*> bitmaps;
+    bitmaps.push_back(bitmap.release());
+    if (large_bitmap.get())
+      bitmaps.push_back(large_bitmap.release());
+    gfx::Image* image = new gfx::Image(bitmaps);
     images_[resource_id] = image;
     return *image;
   }
 
   // The load failed to retrieve the image; show a debugging red square.
   LOG(WARNING) << "Unable to load image with id " << resource_id;
   NOTREACHED();  // Want to assert in debug mode.
   return *GetEmptyImage();
 }
 
@@ skipping 43 matching lines @@
 
 void ResourceBundle::ReloadFonts() {
   base::AutoLock lock_scope(*lock_);
   base_font_.reset();
   LoadFontsIfNecessary();
 }
 
 ResourceBundle::ResourceBundle()
     : lock_(new base::Lock),
       resources_data_(NULL),
+      large_icon_resources_data_(NULL),
       locale_resources_data_(NULL) {
 }
 
 void ResourceBundle::FreeImages() {
   STLDeleteContainerPairSecondPointers(images_.begin(),
                                        images_.end());
   images_.clear();
 }
 
 void ResourceBundle::LoadFontsIfNecessary() {
@@ skipping 77 matching lines @@
     int resource_id, base::StringPiece* data) const {
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   return data_pack_->GetStaticMemory(resource_id);
 }
 
 }  // namespace ui