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

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 286 matching lines @@
   // scroll bar.
   int scrollbar_width = views::NativeScrollBar::GetVerticalScrollBarWidth();
   bounding_box.set_width(std::max(0, bounding_box.width() - scrollbar_width));
   if (UILayoutIsRightToLeft())
     bounding_box.set_x(bounding_box.x() + scrollbar_width);
 
   return bounding_box;
 }
 
 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 {
   return SupportsWindowFeature(FEATURE_TOOLBAR) ||
          SupportsWindowFeature(FEATURE_LOCATIONBAR);
 }
 
 bool BrowserView::IsTabStripVisible() const {
   return SupportsWindowFeature(FEATURE_TABSTRIP);
 }
@@ skipping 1337 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }