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

views/widget/widget_win.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 "views/widget/widget_win.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/win_util.h"
 #include "base/gfx/native_theme.h"
@@ skipping 208 matching lines @@
 
 void WidgetWin::SetContentsView(View* view) {
   DCHECK(view && hwnd_) << "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);
 
-  // Manually size the window here to ensure the root view is laid out.
-  RECT wr;
-  GetWindowRect(&wr);
-  ChangeSize(0, CSize(wr.right - wr.left, wr.bottom - wr.top));
+  // 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 ChangeSize, since the RootView's bounds may not have changed, which
+  // will cause the Layout not to be done otherwise.
+  root_view_->Layout();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Widget implementation:
 
 void WidgetWin::GetBounds(gfx::Rect* out, bool including_frame) const {
   CRect crect;
   if (including_frame) {
     GetWindowRect(&crect);
     *out = gfx::Rect(crect);
@@ skipping 815 matching lines @@
   }
   if (WA_INACTIVE == activation_state) {
     focus_manager->StoreFocusedView();
   } else {
     // We must restore the focus after the message has been DefProc'ed as it
     // does set the focus to the last focused HWND.
     focus_manager->RestoreFocusedView();
   }
 }
 }  // namespace views