chrome/browser/ui/content_settings/content_setting_bubble_model.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/content_settings/content_setting_bubble_model.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/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index c51c9c2ca95e94e2e75324a63e4592bc7b729ee7..4da7a41ac74df23af9e9b8baf835fe3ed99c47ad 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -477,10 +477,9 @@ void ContentSettingPopupBubbleModel::SetPopups() {

PopupItem popup_item;

popup_item.title = title;

// TODO: Make this use gfx::Image.

- TabContents* tab_contents = TabContents::FromWebContents(*i);

popup_item.bitmap =

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

- popup_item.tab_contents = tab_contents;

+ FaviconTabHelper::FromWebContents(*i)->GetFavicon().AsBitmap();

+ popup_item.tab_contents = TabContents::FromWebContents(*i);

add_popup(popup_item);

}