chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 10824296: Enables HiDPI favicon to be displayed in tab strip on CrOS

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/tabs/browser_tab_strip_controller.cc

Issue 10824296: Enables HiDPI favicon to be displayed in tab strip on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased 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/ui/views/tabs/browser_tab_strip_controller.cc

diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

index 7d346f750dbd225ccceb98ffe2f397c041cd3d71..973a5cc89e9ccd7e10e9048252c0ee9e80314f02 100644

--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

@@ -514,9 +514,8 @@ void BrowserTabStripController::SetTabRendererDataFromModel(

TabStatus tab_status) {

TabContents* tab_contents = TabContents::FromWebContents(contents);

- // TODO: Convert data->favicon to gfx::Image.

data->favicon =

- tab_contents->favicon_tab_helper()->GetFavicon().AsBitmap();

+ tab_contents->favicon_tab_helper()->GetFavicon().AsImageSkia();

data->network_state = TabContentsNetworkState(contents);

data->title = contents->GetTitle();

data->url = contents->GetURL();