chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 10837215: exhibit 1: explicit null checks

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 10837215: exhibit 1: explicit null checks Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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/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 b3cce9f507a566dc3650bb31a3ceeae632527dfa..a7829df1234b66c94feffe94fe0020762e4544fc 100644

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

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

@@ -469,7 +469,8 @@ void ContentSettingPopupBubbleModel::SetPopups() {

PopupItem popup_item;

popup_item.title = title;

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

- popup_item.bitmap = (*i)->favicon_tab_helper()->GetFavicon().AsBitmap();

+ const gfx::Image& icon = (*i)->favicon_tab_helper()->GetFavicon();

+ popup_item.bitmap = icon.IsEmpty() ? SkBitmap() : *icon.ToSkBitmap();

popup_item.tab_contents = (*i);

add_popup(popup_item);

}