diff options
| -rw-r--r-- | chrome/browser/browser.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 4ef2629..2fcaa53 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -373,7 +373,10 @@ bool Browser::GetSavedMaximizedState() const { } SkBitmap Browser::GetCurrentPageIcon() const { - return GetSelectedTabContents()->GetFavIcon(); + TabContents* contents = GetSelectedTabContents(); + // |contents| can be NULL since GetCurrentPageIcon() is called by the window + // during the window's creation (before tabs have been added). + return contents ? contents->GetFavIcon() : SkBitmap(); } std::wstring Browser::GetCurrentPageTitle() const { |