Fixing minimize problem with maximized mode.

BUG=35989
TEST=unit test, visual verification

Review URL: https://codereview.chromium.org/227843005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262436 0039d316-1c4b-4281-b951-d872f2087c98

ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

@@ -480,6 +480,34 @@ TEST_F(MaximizeModeWindowManagerTest, IgnoreRestoreStateChages) {
   DestroyMaximizeModeWindowManager();
 }
 
+// Check that minimize and restore do the right thing.
+TEST_F(MaximizeModeWindowManagerTest, TestMinimize) {
+  gfx::Rect rect(10, 10, 100, 100);
+  scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
+                                  rect));
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  EXPECT_EQ(rect.ToString(), window->bounds().ToString());
+  ash::Shell::GetInstance()->EnableMaximizeModeWindowManager(true);
+  EXPECT_TRUE(window_state->IsMaximized());
+  EXPECT_FALSE(window_state->IsMinimized());
+  EXPECT_TRUE(window->IsVisible());
+
+  window_state->Minimize();
+  EXPECT_FALSE(window_state->IsMaximized());
+  EXPECT_TRUE(window_state->IsMinimized());
+  EXPECT_FALSE(window->IsVisible());
+
+  window_state->Maximize();
+  EXPECT_TRUE(window_state->IsMaximized());
+  EXPECT_FALSE(window_state->IsMinimized());
+  EXPECT_TRUE(window->IsVisible());
+
+  ash::Shell::GetInstance()->EnableMaximizeModeWindowManager(false);
+  EXPECT_FALSE(window_state->IsMaximized());
+  EXPECT_FALSE(window_state->IsMinimized());
+  EXPECT_TRUE(window->IsVisible());
+}
+
 // Check that a full screen window is changing to maximized in maximize mode,
 // cannot go to fullscreen and goes back to fullscreen thereafter.
 TEST_F(MaximizeModeWindowManagerTest, FullScreenModeTests) {

ash/wm/maximize_mode/maximize_mode_window_state.cc

@@ -131,7 +131,7 @@ void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,
     case wm::WM_EVENT_MINIMIZE:
       if (current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED) {
         current_state_type_ = wm::WINDOW_STATE_TYPE_MINIMIZED;
-        window_state->Minimize();
+        Minimize(window_state);
       }
       return;
     case wm::WM_EVENT_SHOW_INACTIVE:
@@ -222,4 +222,15 @@ void MaximizeModeWindowState::MaximizeOrCenterWindow(
   }
 }
 
+void MaximizeModeWindowState::Minimize(wm::WindowState* window_state) {
+  ::wm::SetWindowVisibilityAnimationType(
+      window_state->window(), WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
+
+  // Hide the window.
+  window_state->window()->Hide();
+  // Activate another window.
+  if (window_state->IsActive())
+    window_state->Deactivate();
+}
+
 }  // namespace ash

ash/wm/maximize_mode/maximize_mode_window_state.h

@@ -45,6 +45,9 @@ class MaximizeModeWindowState : public wm::WindowState::State {
   // set to true, a bounds change will be animated - otherwise immediate.
   void MaximizeOrCenterWindow(wm::WindowState* window_state, bool animate);
 
+  // Minimize the window.
+  void Minimize(wm::WindowState* window_state);
+
   // The original state object of the window.
   scoped_ptr<wm::WindowState::State> old_state_;