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

ash/frame/custom_frame_view_ash_unittest.cc

 // 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 "ash/frame/custom_frame_view_ash.h"
 
 #include <memory>
 
 #include "ash/ash_layout_constants.h"
 #include "ash/frame/caption_buttons/frame_caption_button.h"
@@ skipping 155 matching lines @@
   gfx::Size max_frame_size = custom_frame_view->GetMaximumSize();
 
   EXPECT_EQ(min_client_size.width(), min_frame_size.width());
   EXPECT_EQ(max_client_size.width(), max_frame_size.width());
   EXPECT_EQ(min_client_size.height() + delegate->GetTitleBarHeight(),
             min_frame_size.height());
   EXPECT_EQ(max_client_size.height() + delegate->GetTitleBarHeight(),
             max_frame_size.height());
 }
 
+// Verify that CustomFrameViewAsh returns the correct minimum frame size when
+// the kMinimumSize property is set.
+TEST_F(CustomFrameViewAshTest, HonorsMinimumSizeProperty) {
+  const gfx::Size min_client_size(500, 500);
+  TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate;
+  delegate->set_minimum_size(min_client_size);
+  std::unique_ptr<views::Widget> widget(CreateWidget(delegate));
+
+  // Update the native window's minimum size property.
+  const gfx::Size min_window_size(600, 700);
+  widget->GetNativeWindow()->SetProperty(aura::client::kMinimumSize,
+                                         new gfx::Size(min_window_size));
+
+  CustomFrameViewAsh* custom_frame_view = delegate->custom_frame_view();
+  const gfx::Size min_frame_size = custom_frame_view->GetMinimumSize();
+
+  EXPECT_EQ(min_window_size, min_frame_size);
+}
+
 // Verify that CustomFrameViewAsh updates the avatar icon based on the
 // avatar icon window property.
 TEST_F(CustomFrameViewAshTest, AvatarIcon) {
   TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate;
   std::unique_ptr<views::Widget> widget(CreateWidget(delegate));
 
   CustomFrameViewAsh* custom_frame_view = delegate->custom_frame_view();
   EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest());
 
   // Avatar image becomes available.
@@ skipping 25 matching lines @@
   EXPECT_GT(initial.width(), maximize_mode_bounds.width());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   delegate->EndFrameCaptionButtonContainerViewAnimations();
   const gfx::Rect after_restore =
       delegate->GetFrameCaptionButtonContainerViewBounds();
   EXPECT_EQ(initial, after_restore);
 }
 
 }  // namespace ash