Load 2x resources on demand

chrome/browser/icon_loader_chromeos.cc

 // Copyright (c) 2012 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 "chrome/browser/icon_loader.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "chrome/browser/icon_loader.h"
 #include "grit/component_extension_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace {
 
 // Used with GenerateImageWithSize() to indicate that the image shouldn't be
 // resized.
 const int kDoNotResize = -1;
 
 struct IdrBySize {
@@ skipping 141 matching lines @@
   }
 }
 
 }  // namespace
 
 void IconLoader::ReadIcon() {
   static base::LazyInstance<IconMapper>::Leaky icon_mapper =
       LAZY_INSTANCE_INITIALIZER;
   int idr = icon_mapper.Get().Lookup(group_, icon_size_);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  const gfx::ImageSkia* image_skia = rb.GetImageNamed(idr).ToImageSkia();
-  image_.reset(new gfx::Image(
-      ResizeImage(*image_skia, IconSizeToDIPSize(icon_size_))));
+  gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
+                                        IconSizeToDIPSize(icon_size_)));
+  image_skia.MakeThreadSafe();
+  image_.reset(new gfx::Image(image_skia));
   target_message_loop_->PostTask(
       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
 }