chrome/browser/ui/webui/extensions/extension_icon_source.cc - Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/extensions/command_handler.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 01554d6283fb517b76bc3f6cb19c82757850c07c..edb0dbb1fe9cfa4259fa3139a1da82746b74c35f 100644

--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc

+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc

@@ -129,7 +129,7 @@ void ExtensionIconSource::StartDataRequest(

// added to |request_map_|.

// Send back the default application icon (not resized or desaturated) as

// the default response.

- callback.Run(BitmapToMemory(GetDefaultAppImage()));

+ callback.Run(BitmapToMemory(GetDefaultAppImage()).get());

return;

}

@@ -174,7 +174,7 @@ void ExtensionIconSource::FinalizeImage(const SkBitmap* image,

else

bitmap = *image;

- request->callback.Run(BitmapToMemory(&bitmap));

+ request->callback.Run(BitmapToMemory(&bitmap).get());

ClearData(request_id);

}