| Index: chrome/browser/ui/webui/extension_icon_source.cc
|
| diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc
|
| index 0e355b82d04ace97eaf541b693b195c5b99c3210..8981179d13862d799b7e1f068e0bd4d0feb31dd3 100644
|
| --- a/chrome/browser/ui/webui/extension_icon_source.cc
|
| +++ b/chrome/browser/ui/webui/extension_icon_source.cc
|
| @@ -52,16 +52,6 @@ SkBitmap* ToBitmap(const unsigned char* data, size_t 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
|
|
|
|
|
| @@ -100,6 +90,17 @@ GURL ExtensionIconSource::GetIconURL(const Extension* extension,
|
| 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.
|
|
|