[mus+ash] Fixes minimum browser window size (store / retrieve kPreferredSize property)

ash/frame/custom_frame_view_ash.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 "ash/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 358 matching lines @@
 
 const char* CustomFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::Size CustomFrameViewAsh::GetMinimumSize() const {
   if (use_empty_minimum_size_for_test_)
     return gfx::Size();
 
   gfx::Size min_client_view_size(frame_->client_view()->GetMinimumSize());
-  return gfx::Size(
+  gfx::Size min_size(
       std::max(header_view_->GetMinimumWidth(), min_client_view_size.width()),
       NonClientTopBorderHeight() + min_client_view_size.height());
+
+  aura::Window* frame_window = frame_->GetNativeWindow();
+  const gfx::Size* min_window_size =
+      frame_window->GetProperty(aura::client::kMinimumSize);
+  if (min_window_size)
+    min_size.SetToMax(*min_window_size);
+  return min_size;
 }
 
 gfx::Size CustomFrameViewAsh::GetMaximumSize() const {
   gfx::Size max_client_size(frame_->client_view()->GetMaximumSize());
   int width = 0;
   int height = 0;
 
   if (max_client_size.width() > 0)
     width = std::max(header_view_->GetMinimumWidth(), max_client_size.width());
   if (max_client_size.height() > 0)
@@ skipping 34 matching lines @@
 FrameCaptionButtonContainerView*
 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash