chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.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/ui/views/ash/launcher/browser_launcher_item_controller.cc

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

Patch Set: win? 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/panels/panel_host.cc ('K') | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | chrome/browser/ui/views/hung_renderer_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

index 3dde3c82e768e20abb108e4327ce7c20dd289075..24f1eea6a62eb58c7905dbcc4c16f452b1a4fede 100644

--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

@@ -227,7 +227,7 @@ void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {

DCHECK_EQ(TYPE_TABBED, type_);

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {

- item.image = tab->favicon_tab_helper()->GetFavicon();

+ item.image = tab->favicon_tab_helper()->GetFavicon().AsBitmap();

if (item.image.empty()) {

item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);

}