chrome/browser/ui/views/extensions/shell_window_views.cc - Issue 11011002: Switch FaviconTabHelper to use WebContentsUserData.

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/extensions/shell_window_views.cc

Issue 11011002: Switch FaviconTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 3 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/extensions/shell_window_views.cc

diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc

index 394d2170a9d5e82560eb979b6aa2e2efa8f8ed6b..7df7a2cc257bd2055942fda3c86ebe0fe1cd3edc 100644

--- a/chrome/browser/ui/views/extensions/shell_window_views.cc

+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc

@@ -595,7 +595,9 @@ gfx::ImageSkia ShellWindowViews::GetWindowAppIcon() {

gfx::ImageSkia ShellWindowViews::GetWindowIcon() {

TabContents* contents = shell_window_->tab_contents();

if (contents) {

- gfx::Image app_icon = contents->favicon_tab_helper()->GetFavicon();

+ FaviconTabHelper* favicon_tab_helper =

+ FaviconTabHelper::FromWebContents(contents->web_contents());

+ gfx::Image app_icon = favicon_tab_helper->GetFavicon();

if (!app_icon.IsEmpty())

return *app_icon.ToImageSkia();

}