Fixes two bugs related to constrained windows:

ui/views/window/client_view.cc

 // Copyright (c) 2012 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 "ui/views/window/client_view.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
@@ skipping 30 matching lines @@
 
 void ClientView::WidgetClosing() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClientView, View overrides:
 
 gfx::Size ClientView::GetPreferredSize() {
   // |contents_view_| is allowed to be NULL up until the point where this view
   // is attached to a Container.
-  if (contents_view_)
-    return contents_view_->GetPreferredSize();
-  return gfx::Size();
+  return contents_view_ ? contents_view_->GetPreferredSize() : gfx::Size();
+}
+
+gfx::Size ClientView::GetMinimumSize() {
+  // |contents_view_| is allowed to be NULL up until the point where this view
+  // is attached to a Container.
+  return contents_view_ ? contents_view_->GetMinimumSize() : gfx::Size();
 }
 
 void ClientView::Layout() {
   // |contents_view_| is allowed to be NULL up until the point where this view
   // is attached to a Container.
   if (contents_view_)
     contents_view_->SetBounds(0, 0, width(), height());
 }
 
 std::string ClientView::GetClassName() const {
@@ skipping 14 matching lines @@
   if (is_add && child == this) {
     DCHECK(GetWidget());
     DCHECK(contents_view_); // |contents_view_| must be valid now!
     // Insert |contents_view_| at index 0 so it is first in the focus chain.
     // (the OK/Cancel buttons are inserted before contents_view_)
     AddChildViewAt(contents_view_, 0);
   }
 }
 
 }  // namespace views