diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:49:41 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:49:41 +0000 |
| commit | a3f0c997f88517619709282f70fbf5e27942cdae (patch) | |
| tree | 6cafeca3cc5241a9927a3ef74b033507fc4f6afb /chrome/browser | |
| parent | ad362c9e0258a61c1d9aa3beee554d939a9b9866 (diff) | |
| download | chromium_src-a3f0c997f88517619709282f70fbf5e27942cdae.zip chromium_src-a3f0c997f88517619709282f70fbf5e27942cdae.tar.gz chromium_src-a3f0c997f88517619709282f70fbf5e27942cdae.tar.bz2 | |
Committed wrong patchset for r18743. This should have been included.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_controller.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 56eb7d0..6af86bf 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -426,10 +426,12 @@ NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; NSImage* image = nil; NavigationEntry* navEntry = contents->controller().GetLastCommittedEntry(); - NavigationEntry::FaviconStatus favIcon = navEntry->favicon(); - const SkBitmap& bitmap = favIcon.bitmap(); - if (favIcon.is_valid() && !bitmap.isNull()) - image = gfx::SkBitmapToNSImage(bitmap); + if (navEntry != NULL) { + NavigationEntry::FaviconStatus favIcon = navEntry->favicon(); + const SkBitmap& bitmap = favIcon.bitmap(); + if (favIcon.is_valid() && !bitmap.isNull()) + image = gfx::SkBitmapToNSImage(bitmap); + } // Either we don't have a valid favicon or there was some issue converting it // from an SkBitmap. Either way, just show the default. |