Fixes regression where showing bookmark bar (or download shelf)

chrome/browser/ui/views/tab_contents/tab_contents_container.cc

 // Copyright (c) 2011 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/ui/views/tab_contents/tab_contents_container.h"
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
@@ skipping 67 matching lines @@
     TabContentsDestroyed(content::Source<TabContents>(source).ptr());
   } else {
     NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, View overrides:
 
 void TabContentsContainer::Layout() {
-  if (native_container_)
+  if (native_container_) {
+    gfx::Size view_size(native_container_->GetView()->size());
     native_container_->GetView()->SetBounds(0, 0, width(), height());
+    // SetBounds does nothing if the bounds haven't changed. We need to force
+    // layout if the bounds haven't changed, but fast resize has.
+    if (view_size.width() == width() && view_size.height() == height() &&
+        native_container_->FastResizeAtLastLayout() &&
+        !native_container_->GetFastResize()) {
+      native_container_->GetView()->Layout();
+    }
+  }
 }
 
 void TabContentsContainer::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 #if defined(HAVE_XINPUT2)
 bool TabContentsContainer::OnMousePressed(const views::MouseEvent& event) {
   DCHECK(tab_contents_);
   if (event.flags() & (ui::EF_LEFT_BUTTON_DOWN |
@@ skipping 78 matching lines @@
   // us to clean up our state in case this happens.
   DCHECK(contents == tab_contents_);
   ChangeTabContents(NULL);
 }
 
 void TabContentsContainer::RenderWidgetHostViewChanged(
     RenderWidgetHostView* new_view) {
   if (new_view)
     new_view->set_reserved_contents_rect(cached_reserved_rect_);
 }