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

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

Issue 505913002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 89cdd6cd99aff683af4cf949b0902680f4c25c73..ec034065df83921d629e1ea3e10d3984d25402ff 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -134,7 +134,7 @@ void ExtensionIconSource::StartDataRequest(
ExtensionIconRequest* request = GetData(next_id);
ExtensionResource icon = IconsInfo::GetIconResource(
- request->extension, request->size, request->match);
+ request->extension.get(), request->size, request->match);
if (icon.relative_path().empty()) {
LoadIconFailed(next_id);
@@ -203,7 +203,8 @@ void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
int request_id) {
ExtensionIconRequest* request = GetData(request_id);
ImageLoader::Get(profile_)->LoadImageAsync(
- request->extension, icon,
+ request->extension.get(),
+ icon,
gfx::Size(request->size, request->size),
base::Bind(&ExtensionIconSource::OnImageLoaded, AsWeakPtr(), request_id));
}
@@ -218,7 +219,7 @@ void ExtensionIconSource::LoadFaviconImage(int request_id) {
}
GURL favicon_url =
- AppLaunchInfo::GetFullLaunchURL(GetData(request_id)->extension);
+ AppLaunchInfo::GetFullLaunchURL(GetData(request_id)->extension.get());
favicon_service->GetRawFaviconForPageURL(
favicon_url,
favicon_base::FAVICON,
@@ -262,7 +263,7 @@ void ExtensionIconSource::OnImageLoaded(int request_id,
void ExtensionIconSource::LoadIconFailed(int request_id) {
ExtensionIconRequest* request = GetData(request_id);
ExtensionResource icon = IconsInfo::GetIconResource(
- request->extension, request->size, request->match);
+ request->extension.get(), request->size, request->match);
if (request->size == extension_misc::EXTENSION_ICON_BITTY)
LoadFaviconImage(request_id);

Powered by Google App Engine
This is Rietveld 408576698