Restore App window's size and maximized state from before it was closed

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index be049feecb137888a33dc696f5b51ac4c7067900..901822e74a7c5745070ea2b2f327dd4f42102459 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -36,6 +36,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ -44,6 +45,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -140,6 +142,29 @@ void ClickAllAppsButtonFromStartPage(ui::test::EventGenerator* generator,
   controller_test.LayoutContentsView();
 }
 
+// Find the browser that associated with |app_name|.
+Browser* FindBrowserForApp(const std::string& app_name) {
+  Browser* browser = nullptr;
+  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+    std::string browser_app_name =
+        web_app::GetExtensionIdFromApplicationName((*it)->app_name());
+    if (browser_app_name == app_name) {
+      browser = *it;
+      break;
+    }
+  }
+  return browser;
+}
+
+// Close |app_browser| and wait until it's closed.
+void CloseAppBrowserWindow(Browser* app_browser) {
+  content::WindowedNotificationObserver close_observer(
+      chrome::NOTIFICATION_BROWSER_CLOSED,
+      content::Source<Browser>(app_browser));
+  app_browser->window()->Close();
+  close_observer.Wait();
+}
+
 }  // namespace
 
 class LauncherPlatformAppBrowserTest
@@ -1299,6 +1324,42 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, AsyncActivationStateCheck) {
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(shortcut_id)->status);
 }
 
+// Test that the App window could restore to its previous window state from
+// before it was closed.
+IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, AppWindowRestoreBehaviorTest) {
+  // Open an App, maximized its window, and close it.
+  const Extension* extension = LoadAndLaunchExtension(
+      "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+  Browser* app_browser = FindBrowserForApp(extension->id());
+  ASSERT_TRUE(app_browser);
+  aura::Window* window = app_browser->window()->GetNativeWindow();
+  EXPECT_FALSE(ash::wm::GetWindowState(window)->IsMaximized());
+  ash::wm::GetWindowState(window)->Maximize();
+  EXPECT_TRUE(ash::wm::GetWindowState(window)->IsMaximized());
+  CloseAppBrowserWindow(app_browser);
+
+  // Reopen the App. It should start maximized. Un-maximize it and close it.
+  extension = LoadAndLaunchExtension(
+      "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+  app_browser = FindBrowserForApp(extension->id());
+  ASSERT_TRUE(app_browser);
+  window = app_browser->window()->GetNativeWindow();
+  EXPECT_TRUE(ash::wm::GetWindowState(window)->IsMaximized());
+
+  ash::wm::GetWindowState(window)->Restore();
+  EXPECT_FALSE(ash::wm::GetWindowState(window)->IsMaximized());
+  app_browser->window()->Close();
+  CloseAppBrowserWindow(app_browser);
+
+  // Reopen the App. It should start un-maximized.
+  extension = LoadAndLaunchExtension(
+      "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+  app_browser = FindBrowserForApp(extension->id());
+  ASSERT_TRUE(app_browser);
+  window = app_browser->window()->GetNativeWindow();
+  EXPECT_FALSE(ash::wm::GetWindowState(window)->IsMaximized());
+}
+
 // Checks that a windowed application does not add an item to the browser list.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestNoDefaultBrowser,
     WindowedAppDoesNotAddToBrowser) {