Fix crash when creating a desktop shortcut for apps with a missing icon.

chrome/browser/ui/webui/extension_icon_source.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 "chrome/browser/ui/webui/extension_icon_source.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
@@ skipping 34 matching lines @@
   *image = SkBitmapOperations::CreateHSLShiftedBitmap(*image, shift);
 }
 
 SkBitmap* ToBitmap(const unsigned char* data, size_t size) {
   webkit_glue::ImageDecoder decoder;
   SkBitmap* decoded = new SkBitmap();
   *decoded = decoder.Decode(data, size);
   return decoded;
 }
 
-SkBitmap* LoadImageByResourceId(int resource_id) {
-  std::string contents = ResourceBundle::GetSharedInstance()
-      .GetRawDataResource(resource_id).as_string();
-
-  // Convert and return it.
-  const unsigned char* data =
-      reinterpret_cast<const unsigned char*>(contents.data());
-  return ToBitmap(data, contents.length());
-}
-
 }  // namespace
 
 
 ExtensionIconSource::ExtensionIconSource(Profile* profile)
     : DataSource(chrome::kChromeUIExtensionIconHost, MessageLoop::current()),
       profile_(profile),
       next_tracker_id_(0) {
   tracker_.reset(new ImageLoadingTracker(this));
 }
 
@@ skipping 18 matching lines @@
   GURL icon_url(base::StringPrintf("%s%s/%d/%d%s",
                                    chrome::kChromeUIExtensionIconURL,
                                    extension->id().c_str(),
                                    icon_size,
                                    match,
                                    grayscale ? "?grayscale=true" : ""));
   CHECK(icon_url.is_valid());
   return icon_url;
 }
 
+// static
+SkBitmap* ExtensionIconSource::LoadImageByResourceId(int resource_id) {
+  std::string contents = ResourceBundle::GetSharedInstance()
+      .GetRawDataResource(resource_id).as_string();
+
+  // Convert and return it.
+  const unsigned char* data =
+      reinterpret_cast<const unsigned char*>(contents.data());
+  return ToBitmap(data, contents.length());
+}
+
 std::string ExtensionIconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 void ExtensionIconSource::StartDataRequest(const std::string& path,
                                            bool is_incognito,
                                            int request_id) {
   // This is where everything gets started. First, parse the request and make
@@ skipping 198 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }