[Ash] Always show minimize button.

ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

 // Copyright 2013 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/caption_buttons/frame_caption_button_container_view.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 87 matching lines @@
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerViewTest);
 };
 
 // Test how the allowed actions affect which caption buttons are visible.
 TEST_F(FrameCaptionButtonContainerViewTest, ButtonVisibility) {
   // All the buttons should be visible when minimizing and maximizing are
   // 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);
   EXPECT_TRUE(t1.minimize_button()->visible());
   EXPECT_TRUE(t1.size_button()->visible());
   EXPECT_TRUE(t1.close_button()->visible());
   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);
   EXPECT_TRUE(t2.minimize_button()->visible());
   EXPECT_FALSE(t2.size_button()->visible());
   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
 // correct placement of the buttons.
 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();
 
   FrameCaptionButtonContainerView::TestApi test(&container);
   gfx::Rect initial_minimize_button_bounds = test.minimize_button()->bounds();
   gfx::Rect initial_size_button_bounds = test.size_button()->bounds();
   gfx::Rect initial_close_button_bounds = test.close_button()->bounds();
   gfx::Rect initial_container_bounds = container.bounds();
 
@@ skipping 34 matching lines @@
   EXPECT_TRUE(test.size_button()->visible());
   EXPECT_TRUE(test.close_button()->visible());
   EXPECT_EQ(initial_minimize_button_bounds, test.minimize_button()->bounds());
   EXPECT_EQ(initial_size_button_bounds, test.size_button()->bounds());
   EXPECT_EQ(initial_close_button_bounds, test.close_button()->bounds());
   EXPECT_EQ(container.GetPreferredSize().width(),
             initial_container_bounds.width());
 }
 
 }  // namespace ash