chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index 601a276ad1a97dc880c4ad58057f8978a8eb544c..8ffeea33d2e9fce44fe864eefbac4c4c52f1ff8c 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -816,7 +816,8 @@ void LocationBarViewGtk::OnSetFocus() {

}

SkBitmap LocationBarViewGtk::GetFavicon() const {

- return GetTabContents()->favicon_tab_helper()->GetFavicon().AsBitmap();

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

+ return icon.IsEmpty() ? SkBitmap() : *icon.ToSkBitmap();

}

string16 LocationBarViewGtk::GetTitle() const {