content/public/browser/favicon_status.cc - Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image.

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: content/public/browser/favicon_status.cc

Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 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:

Index: content/public/browser/favicon_status.cc

diff --git a/content/public/browser/favicon_status.cc b/content/public/browser/favicon_status.cc

index 8e540038ce06c6e888f75521632aef5093ac2e0b..89fd46d7fd03f9ca97119e5de997ecce3d287068 100644

--- a/content/public/browser/favicon_status.cc

+++ b/content/public/browser/favicon_status.cc

@@ -13,8 +13,4 @@ FaviconStatus::FaviconStatus() : valid(false) {

image = gfx::Image(*GetContentClient()->browser()->GetDefaultFavicon());

}

-SkBitmap FaviconStatus::AsBitmap() const {

- return image.IsEmpty() ? SkBitmap() : *image.ToSkBitmap();

} // namespace content

« no previous file with comments | « content/public/browser/favicon_status.h ('k') | ui/gfx/image/image.h » ('j') | no next file with comments »