chrome/browser/task_manager/task_manager_resource_providers.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: chrome/browser/task_manager/task_manager_resource_providers.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: chrome/browser/task_manager/task_manager_resource_providers.cc

diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc

index 72338057d70a4e5aafc4fc868569addfb24cc70e..dbc26f76e4d17f6cd3d43d3cf8e825bcb447e7cd 100644

--- a/chrome/browser/task_manager/task_manager_resource_providers.cc

+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc

@@ -334,7 +334,7 @@ string16 TaskManagerTabContentsResource::GetProfileName() const {

gfx::ImageSkia TaskManagerTabContentsResource::GetIcon() const {

if (IsPrerendering())

return *prerender_icon_;

- return tab_contents_->favicon_tab_helper()->GetFavicon();

+ return tab_contents_->favicon_tab_helper()->GetFavicon().AsImageSkia();

}

WebContents* TaskManagerTabContentsResource::GetWebContents() const {

« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »