diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:36:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:36:23 +0000 |
| commit | ce5348a85330881a9ff322f20ec7a7f7caee99e6 (patch) | |
| tree | 90fbe60aa58f7ffddc53239fa697d52fe7464cad | |
| parent | 504c11ebcd8a944cc000d6adae03f916833e170a (diff) | |
| download | chromium_src-ce5348a85330881a9ff322f20ec7a7f7caee99e6.zip chromium_src-ce5348a85330881a9ff322f20ec7a7f7caee99e6.tar.gz chromium_src-ce5348a85330881a9ff322f20ec7a7f7caee99e6.tar.bz2 | |
This fixes a crash while trying to duplicate an application window.
Review URL: http://codereview.chromium.org/14823
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7228 0039d316-1c4b-4281-b951-d872f2087c98
| -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 { |