chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/views/tabs/browser_tab_strip_controller.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/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 d101fc1e0e215af8dbc5420859d8d369ef7e32a6..32262035edabbf446656165a858bbb1263ade1f9 100644

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

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

@@ -512,8 +512,8 @@ void BrowserTabStripController::SetTabRendererDataFromModel(

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

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

- data->favicon =

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

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

+ data->favicon = icon.IsEmpty() ? SkBitmap() : *icon.ToSkBitmap();

data->network_state = TabContentsNetworkState(contents);

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

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

« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | ui/gfx/image/image.h » ('j') | no next file with comments »