Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: chrome/browser/ui/webui/extensions/extension_icon_source.cc

Issue 10067033: RefCounted types should not have public destructors, chrome/browser/ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_icon_source.h ('k') | chrome/browser/ui/webui/fileicon_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698