Call Layout directly from SetContentsView. In the case where the Widget is cr...

views/widget/widget_gtk.cc

 // Copyright (c) 2009 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 "views/widget/widget_gtk.h"
 
 #include "app/gfx/path.h"
 #include "base/compiler_specific.h"
 #include "views/fill_layout.h"
 #include "views/widget/default_theme_provider.h"
@@ skipping 218 matching lines @@
       << "Can't be called until after the HWND is created!";
   // The ContentsView must be set up _after_ the window is created so that its
   // Widget pointer is valid.
   root_view_->SetLayoutManager(new FillLayout);
   if (root_view_->GetChildViewCount() != 0)
     root_view_->RemoveAllChildViews(true);
   root_view_->AddChildView(view);
 
   DCHECK(widget_);  // Widget must have been created by now.
 
-  OnSizeAllocate(widget_, &(widget_->allocation));
+  // Force a layout now, since the attached hierarchy won't be ready for the
+  // containing window's bounds. Note that we call Layout directly rather than
+  // calling OnSizeAllocate, since the RootView's bounds may not have changed,
+  // which will cause the Layout not to be done otherwise.
+  root_view_->Layout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetGtk, Widget implementation:
 
 void WidgetGtk::GetBounds(gfx::Rect* out, bool including_frame) const {
   DCHECK(widget_);
 
   int x = 0, y = 0, w, h;
   if (GTK_IS_WINDOW(widget_)) {
@@ skipping 560 matching lines @@
 void WidgetGtk::HandleGrabBroke() {
   if (has_capture_) {
     if (is_mouse_down_)
       root_view_->ProcessMouseDragCanceled();
     is_mouse_down_ = false;
     has_capture_ = false;
   }
 }
 
 }  // namespace views