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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #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"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
@@ skipping 76 matching lines @@
   gfx::Rect all_apps_rect = all_apps_button->GetBoundsInScreen();
   all_apps_rect.Offset(-display_origin.x(), -display_origin.y());
   generator->MoveMouseTo(all_apps_rect.CenterPoint().x(),
                          all_apps_rect.CenterPoint().y());
   generator->ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   // Run Layout() to effectively complete the animation to the apps page.
   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
     : public extensions::PlatformAppBrowserTest {
  protected:
   LauncherPlatformAppBrowserTest() : shelf_(NULL), controller_(NULL) {
   }
 
   ~LauncherPlatformAppBrowserTest() override {}
 
@@ skipping 1139 matching lines @@
   // has to be active.
   tab_strip->ActivateTabAt(1, false);
   EXPECT_EQ(1, tab_strip->active_index());
 
   // Close the web contents.
   tab_strip->CloseWebContentsAt(1, TabStripModel::CLOSE_NONE);
   // The status should now be set to closed.
   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) {
   // Get the number of items in the browser menu.
   size_t items = NumberOfDetectedLauncherBrowsers(false);
   size_t running_browser = chrome::GetTotalBrowserCount();
   EXPECT_EQ(0u, items);
   EXPECT_EQ(0u, running_browser);
 
   LoadAndLaunchExtension(
@@ skipping 957 matching lines @@
   controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0);
 
   // There should be two new browsers.
   EXPECT_EQ(3u, chrome::GetTotalBrowserCountForProfile(browser()->profile()));
 
   // The apps should now be running, with the last opened app active.
   EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_ACTIVE,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 }