Mac/Linux: Ensure window size constraints propagate to the window server during Init

ui/views/widget/native_widget_mac.mm

 // Copyright 2014 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/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 16 matching lines @@
   if (params.remove_standard_frame)
     return NSBorderlessWindowMask;
 
   if (params.type == Widget::InitParams::TYPE_WINDOW) {
     return NSTitledWindowMask | NSClosableWindowMask |
            NSMiniaturizableWindowMask | NSResizableWindowMask;
   }
   return NSBorderlessWindowMask;
 }
 
-gfx::Size WindowSizeForClientAreaSize(NSWindow* window, const gfx::Size& size) {
-  NSRect content_rect = NSMakeRect(0, 0, size.width(), size.height());
-  NSRect frame_rect = [window frameRectForContentRect:content_rect];
-  return gfx::Size(NSWidth(frame_rect), NSHeight(frame_rect));
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMac, public:
 
 NativeWidgetMac::NativeWidgetMac(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       bridge_(new BridgedNativeWidget(this)),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
 }
@@ skipping 31 matching lines @@
 // NativeWidgetMac, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetMac::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   base::scoped_nsobject<NSWindow> window([CreateNSWindow(params) retain]);
   [window setReleasedWhenClosed:NO];  // Owned by scoped_nsobject.
   bridge_->Init(window, params);
 
   delegate_->OnNativeWidgetCreated(true);
 
-  OnSizeConstraintsChanged();
-
   bridge_->SetFocusManager(GetWidget()->GetFocusManager());
 
   DCHECK(GetWidget()->GetRootView());
   bridge_->SetRootView(GetWidget()->GetRootView());
 
   // "Infer" must be handled by ViewsDelegate::OnBeforeWidgetInit().
   DCHECK_NE(Widget::InitParams::INFER_OPACITY, params.opacity);
   bool translucent = params.opacity == Widget::InitParams::TRANSLUCENT_WINDOW;
   bridge_->CreateLayer(params.layer_type, translucent);
 }
@@ skipping 93 matching lines @@
 
 internal::InputMethodDelegate* NativeWidgetMac::GetInputMethodDelegate() {
   return bridge_.get();
 }
 
 ui::InputMethod* NativeWidgetMac::GetHostInputMethod() {
   return bridge_ ? bridge_->GetHostInputMethod() : NULL;
 }
 
 void NativeWidgetMac::CenterWindow(const gfx::Size& size) {
-  SetSize(WindowSizeForClientAreaSize(GetNativeWindow(), size));
+  SetSize(
+      BridgedNativeWidget::GetWindowSizeForClientSize(GetNativeWindow(), size));
   // Note that this is not the precise center of screen, but it is the standard
   // location for windows like dialogs to appear on screen for Mac.
   // TODO(tapted): If there is a parent window, center in that instead.
   [GetNativeWindow() center];
 }
 
 void NativeWidgetMac::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   *bounds = GetRestoredBounds();
@@ skipping 288 matching lines @@
 void NativeWidgetMac::SetVisibilityAnimationTransition(
     Widget::VisibilityTransition transition) {
   NOTIMPLEMENTED();
 }
 
 ui::NativeTheme* NativeWidgetMac::GetNativeTheme() const {
   return ui::NativeTheme::instance();
 }
 
 void NativeWidgetMac::OnRootViewLayout() {
-  NOTIMPLEMENTED();
+  // Ensure possible changes to the non-client view (e.g. Minimum/Maximum size)
+  // propagate through to the NSWindow properties.
+  OnSizeConstraintsChanged();
 }
 
 bool NativeWidgetMac::IsTranslucentWindowOpacitySupported() const {
   return false;
 }
 
 void NativeWidgetMac::OnSizeConstraintsChanged() {
   bridge_->OnSizeConstraintsChanged();
 }
 
@@ skipping 108 matching lines @@
 }
 
 // static
 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() {
   NOTIMPLEMENTED();
   return gfx::FontList();
 }
 
 }  // namespace internal
 }  // namespace views