[Ash] Always show minimize button.

ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

Index: ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
index a487005bf70c7128f58a5dc24d88f5725f273a68..c33007ac7ea75f81ef30e781aa0aed0c05f1ebba 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -108,8 +108,7 @@ TEST_F(FrameCaptionButtonContainerViewTest, ButtonVisibility) {
   // allowed.

[pkotwicz, 2014/09/19 03:34:31]

Nit: Remove mention of minimizng being allowed

   scoped_ptr<views::Widget> widget_can_maximize(
       CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container1(widget_can_maximize.get(),
-      FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
+  FrameCaptionButtonContainerView container1(widget_can_maximize.get());
   SetMockImages(&container1);
   container1.Layout();
   FrameCaptionButtonContainerView::TestApi t1(&container1);
@@ -119,12 +118,10 @@ TEST_F(FrameCaptionButtonContainerViewTest, ButtonVisibility) {
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container1, *t1.minimize_button(), *t1.close_button()));
 
-  // The minimize button should be visible when minimizing is allowed but
-  // maximizing is disallowed.
+  // The minimize button should still be visible when maximizing is disallowed.

[pkotwicz, 2014/09/19 03:34:31]

How about: "The maximize button should not be visible when maximizing is
disallowed."

   scoped_ptr<views::Widget> widget_cannot_maximize(
       CreateTestWidget(MAXIMIZE_DISALLOWED));
-  FrameCaptionButtonContainerView container2(widget_cannot_maximize.get(),
-      FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
+  FrameCaptionButtonContainerView container2(widget_cannot_maximize.get());
   SetMockImages(&container2);
   container2.Layout();
   FrameCaptionButtonContainerView::TestApi t2(&container2);
@@ -133,19 +130,6 @@ TEST_F(FrameCaptionButtonContainerViewTest, ButtonVisibility) {
   EXPECT_TRUE(t2.close_button()->visible());
   EXPECT_TRUE(CheckButtonsAtEdges(
       &container2, *t2.minimize_button(), *t2.close_button()));
-
-  // Neither the minimize button nor the size button should be visible when
-  // neither minimizing nor maximizing are allowed.
-  FrameCaptionButtonContainerView container3(widget_cannot_maximize.get(),
-      FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED);
-  SetMockImages(&container3);
-  container3.Layout();
-  FrameCaptionButtonContainerView::TestApi t3(&container3);
-  EXPECT_FALSE(t3.minimize_button()->visible());
-  EXPECT_FALSE(t3.size_button()->visible());
-  EXPECT_TRUE(t3.close_button()->visible());
-  EXPECT_TRUE(CheckButtonsAtEdges(
-      &container3, *t3.close_button(), *t3.close_button()));
 }
 
 // Tests that the layout animations trigered by button visibility result in the
@@ -154,8 +138,7 @@ TEST_F(FrameCaptionButtonContainerViewTest,
        TestUpdateSizeButtonVisibilityAnimation) {
   scoped_ptr<views::Widget> widget_can_maximize(
       CreateTestWidget(MAXIMIZE_ALLOWED));
-  FrameCaptionButtonContainerView container(widget_can_maximize.get(),
-      FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
+  FrameCaptionButtonContainerView container(widget_can_maximize.get());
   SetMockImages(&container);
   container.SetBoundsRect(gfx::Rect(container.GetPreferredSize()));
   container.Layout();