Notify WindowStateObserver when minimizing in maximized mode.

ash/wm/maximize_mode/maximize_mode_window_manager_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/common/wm/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/switchable_windows.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_observer.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 
-// TODO(skuhne): These tests are failing on Widows because maximized is there
-// differently handled. Fix this!
-#if !defined(OS_WIN)
-
 class MaximizeModeWindowManagerTest : public test::AshTestBase {
  public:
   MaximizeModeWindowManagerTest() {}
   ~MaximizeModeWindowManagerTest() override {}
 
   // Creates a window which has a fixed size.
   aura::Window* CreateFixedSizeNonMaximizableWindow(ui::wm::WindowType type,
                                                     const gfx::Rect& bounds) {
     return CreateWindowInWatchedContainer(type, bounds, gfx::Size(), false,
                                           false);
@@ skipping 1527 matching lines @@
   wm::GetWindowState(window.get())->OnWMEvent(&dock_event);
   EXPECT_TRUE(wm::GetWindowState(window.get())->IsDocked());
   EXPECT_FALSE(wm::GetWindowState(window.get())->IsMaximized());
 
   MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
   EXPECT_TRUE(wm::GetWindowState(window.get())->IsDocked());
   EXPECT_FALSE(wm::GetWindowState(window.get())->IsMaximized());
   EXPECT_EQ(0, manager->GetNumberOfManagedWindows());
 }
 
-#endif  // OS_WIN
+namespace {
+
+class TestObserver : public wm::WindowStateObserver {
+ public:
+  TestObserver(){};
+  ~TestObserver() override{};
+
+  // wm::WindowStateObserver:
+  void OnPreWindowStateTypeChange(wm::WindowState* window_state,
+                                  wm::WindowStateType old_type) override {
+    pre_count_++;
+    last_old_state_ = old_type;
+  }
+
+  void OnPostWindowStateTypeChange(wm::WindowState* window_state,
+                                   wm::WindowStateType old_type) override {
+    post_count_++;
+    EXPECT_EQ(last_old_state_, old_type);
+  }
+
+  int GetPreCountAndReset() {
+    int r = pre_count_;
+    pre_count_ = 0;
+    return r;
+  }
+
+  int GetPostCountAndReset() {
+    int r = post_count_;
+    post_count_ = 0;
+    return r;
+  }
+
+  wm::WindowStateType GetLastOldStateAndReset() {
+    wm::WindowStateType r = last_old_state_;
+    last_old_state_ = wm::WINDOW_STATE_TYPE_DEFAULT;
+    return r;
+  }
+
+ private:
+  int pre_count_ = 0;
+  int post_count_ = 0;
+  wm::WindowStateType last_old_state_ = wm::WINDOW_STATE_TYPE_DEFAULT;
+
+  DISALLOW_COPY_AND_ASSIGN(TestObserver);
+};
+
+}  // namespace
+
+TEST_F(MaximizeModeWindowManagerTest, StateTyepChange) {
+  TestObserver observer;
+  gfx::Rect rect(10, 10, 200, 50);
+  std::unique_ptr<aura::Window> window(
+      CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+
+  CreateMaximizeModeWindowManager();
+
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  window_state->AddObserver(&observer);
+
+  window->Show();
+  EXPECT_TRUE(window_state->IsMaximized());
+  EXPECT_EQ(0, observer.GetPreCountAndReset());
+  EXPECT_EQ(0, observer.GetPostCountAndReset());
+
+  // Window is already in maximized mode.
+  wm::WMEvent maximize_event(wm::WM_EVENT_MAXIMIZE);
+  window_state->OnWMEvent(&maximize_event);
+  EXPECT_EQ(0, observer.GetPreCountAndReset());
+  EXPECT_EQ(0, observer.GetPostCountAndReset());
+
+  wm::WMEvent fullscreen_event(wm::WM_EVENT_FULLSCREEN);
+  window_state->OnWMEvent(&fullscreen_event);
+  EXPECT_EQ(1, observer.GetPreCountAndReset());
+  EXPECT_EQ(1, observer.GetPostCountAndReset());
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_MAXIMIZED,
+            observer.GetLastOldStateAndReset());
+
+  window_state->OnWMEvent(&maximize_event);
+  EXPECT_EQ(1, observer.GetPreCountAndReset());
+  EXPECT_EQ(1, observer.GetPostCountAndReset());
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_FULLSCREEN,
+            observer.GetLastOldStateAndReset());
+
+  wm::WMEvent minimize_event(wm::WM_EVENT_MINIMIZE);
+  window_state->OnWMEvent(&minimize_event);
+  EXPECT_EQ(1, observer.GetPreCountAndReset());
+  EXPECT_EQ(1, observer.GetPostCountAndReset());
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_MAXIMIZED,
+            observer.GetLastOldStateAndReset());
+
+  wm::WMEvent restore_event(wm::WM_EVENT_NORMAL);
+  window_state->OnWMEvent(&restore_event);
+  EXPECT_EQ(1, observer.GetPreCountAndReset());
+  EXPECT_EQ(1, observer.GetPostCountAndReset());
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_MINIMIZED,
+            observer.GetLastOldStateAndReset());
+
+  window_state->RemoveObserver(&observer);
+
+  DestroyMaximizeModeWindowManager();
+}
 
 }  // namespace ash