Fix browser window crash on windows.

BUG=13681 (http://crbug.com/13681)

TEST=Follow these steps
-Ctrl+Shift+N to Incognito window.
-Download a file
-Close the Incognito window after download is finished.

Review URL: http://codereview.chromium.org/120001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18151 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 2a6ea40..16e2e98 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -294,6 +294,9 @@ BrowserView::~BrowserView() {
   ticker_.Stop();
   ticker_.UnregisterTickHandler(&hung_window_detector_);
 #endif
+
+  // Explicitly set browser_ to NULL
+  browser_.reset();
 }
 
 // static
@@ -801,6 +804,11 @@ void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
 }
 
 void BrowserView::SetDownloadShelfVisible(bool visible) {
+  // This can be called from the superclass destructor, when it destroys our
+  // child views. At that point, browser_ is already gone.
+  if (browser_ == NULL)
+    return;
+
   if (IsDownloadShelfVisible() != visible) {
     if (visible) {
       // Invoke GetDownloadShelf to force the shelf to be created.