Fixes bug where Layout might not get invoked on view hosting

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 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 "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 172 matching lines @@
       views::View::ConvertPointToScreen(this, &screen_origin);
       DCHECK_GT(max_autocomplete_y, screen_origin.y());
       int preview_origin = max_autocomplete_y - screen_origin.y();
       if (preview_origin < height()) {
         preview_->SetBounds(0, preview_origin, width(),
                             height() - preview_origin);
       } else {
         preview_->SetBounds(0, 0, 0, 0);
       }
     }
+
+    // Need to invoke views::View in case any views whose bounds didn't change
+    // still need a layout.
+    views::View::Layout();
   }
 
  private:
   BrowserView* browser_view_;
   views::View* active_;
   views::View* preview_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsContainer);
 };
 
@@ skipping 626 matching lines @@
   return status_bubble_.get();
 }
 
 void BrowserView::SelectedTabToolbarSizeChanged(bool is_animating) {
   if (is_animating) {
     contents_container_->SetFastResize(true);
     UpdateUIForContents(browser_->GetSelectedTabContents());
     contents_container_->SetFastResize(false);
   } else {
     UpdateUIForContents(browser_->GetSelectedTabContents());
+    // When transitioning from animating to not animating we need to make sure
+    // the contents_container_ gets layed out. If we don't do this and the
+    // bounds haven't changed contents_container_ won't get a Layout out and
+    // we'll end up with a gray rect because the clip wasn't updated.
+    contents_container_->InvalidateLayout();
     contents_split_->Layout();
   }
 }
 
 void BrowserView::UpdateTitleBar() {
   frame_->GetWindow()->UpdateWindowTitle();
   if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning())
     frame_->GetWindow()->UpdateWindowIcon();
 }
 
@@ skipping 1663 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }