| Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
|
| index 8a1b947b13ed6beb009443c823dfa4435d7563b7..0dfb7e31161a32f65c50a5f8b86d4e462411a739 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
|
| @@ -66,11 +66,6 @@ struct ExtensionIconSource::ExtensionIconRequest {
|
| ExtensionIconSet::MatchType match;
|
| };
|
|
|
| -ExtensionIconSource::~ExtensionIconSource() {
|
| - // Clean up all the temporary data we're holding for requests.
|
| - STLDeleteValues(&request_map_);
|
| -}
|
| -
|
| // static
|
| GURL ExtensionIconSource::GetIconURL(const Extension* extension,
|
| int icon_size,
|
| @@ -130,15 +125,9 @@ void ExtensionIconSource::StartDataRequest(const std::string& path,
|
| }
|
| }
|
|
|
| -void ExtensionIconSource::LoadIconFailed(int request_id) {
|
| - ExtensionIconRequest* request = GetData(request_id);
|
| - ExtensionResource icon =
|
| - request->extension->GetIconResource(request->size, request->match);
|
| -
|
| - if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY)
|
| - LoadFaviconImage(request_id);
|
| - else
|
| - LoadDefaultImage(request_id);
|
| +ExtensionIconSource::~ExtensionIconSource() {
|
| + // Clean up all the temporary data we're holding for requests.
|
| + STLDeleteValues(&request_map_);
|
| }
|
|
|
| const SkBitmap* ExtensionIconSource::GetWebStoreImage() {
|
| @@ -265,6 +254,17 @@ void ExtensionIconSource::OnImageLoaded(const gfx::Image& image,
|
| FinalizeImage(image.ToSkBitmap(), request_id);
|
| }
|
|
|
| +void ExtensionIconSource::LoadIconFailed(int request_id) {
|
| + ExtensionIconRequest* request = GetData(request_id);
|
| + ExtensionResource icon =
|
| + request->extension->GetIconResource(request->size, request->match);
|
| +
|
| + if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY)
|
| + LoadFaviconImage(request_id);
|
| + else
|
| + LoadDefaultImage(request_id);
|
| +}
|
| +
|
| bool ExtensionIconSource::ParseData(const std::string& path,
|
| int request_id) {
|
| // Extract the parameters from the path by lower casing and splitting.
|
|
|