Fix a DCHECK in certain cases when coming out of fullscreen mode. The frame ...

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc	(revision 10431)
+++ chrome/browser/views/frame/browser_view.cc	(working copy)
@@ -304,7 +304,10 @@
 }
 
 int BrowserView::GetTabStripHeight() const {
-  return tabstrip_->height();
+  // We want to return tabstrip_->height(), but we might be called in the midst
+  // of layout, when that hasn't yet been updated to reflect the current state.
+  // So return what the tabstrip height _ought_ to be right now.
+  return IsTabStripVisible() ? tabstrip_->GetPreferredSize().height() : 0;
 }
 
 bool BrowserView::IsToolbarVisible() const {