Load 2x resources on demand

chrome/browser/icon_loader_linux.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 <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/nix/mime_util_xdg.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 #include "webkit/glue/image_decoder.h"
 
 using std::string;
 
 void IconLoader::ReadIcon() {
   int size_pixels = 0;
   switch (icon_size_) {
     case IconLoader::SMALL:
       size_pixels = 16;
       break;
@@ skipping 15 matching lines @@
     file_util::ReadFileToString(filename, &icon_data);
 
     webkit_glue::ImageDecoder decoder;
     SkBitmap bitmap;
     bitmap = decoder.Decode(
         reinterpret_cast<const unsigned char*>(icon_data.data()),
         icon_data.length());
     if (!bitmap.empty()) {
       DCHECK_EQ(size_pixels, bitmap.width());
       DCHECK_EQ(size_pixels, bitmap.height());
-      image_.reset(new gfx::Image(bitmap));
+      gfx::ImageSkia image_skia(bitmap);
+      image_skia.MakeThreadSafe();
+      image_.reset(new gfx::Image(image_skia));
     } else {
       LOG(WARNING) << "Unsupported file type or load error: "
                    << filename.value();
     }
   }
 
   target_message_loop_->PostTask(
       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
 }