Close AppWindow to perform clean shutdown

extensions/shell/browser/shell_desktop_controller.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 "extensions/shell/browser/shell_desktop_controller.h"
 
 #include "base/command_line.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/native_app_window.h"
+#include "extensions/shell/browser/shell_app_delegate.h"
 #include "extensions/shell/browser/shell_app_window.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
@@ skipping 128 matching lines @@
   virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsFocusRules);
 };
 
 }  // namespace
 
-ShellDesktopController::ShellDesktopController() {
+ShellDesktopController::ShellDesktopController()
+    : app_window_(NULL) {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(this);
   display_configurator_.reset(new ui::DisplayConfigurator);
   display_configurator_->Init(false);
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
 
   CreateRootWindow();
 }
 
 ShellDesktopController::~ShellDesktopController() {
-  app_window_.reset();
+  CloseAppWindows();
   DestroyRootWindow();
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(this);
 #endif
 }
 
 aura::WindowTreeHost* ShellDesktopController::GetHost() {
   return host_.get();
 }
 
-ShellAppWindow* ShellDesktopController::CreateAppWindow(
+ShellAppWindow* ShellDesktopController::CreateShellAppWindow(
     content::BrowserContext* context,
     const Extension* extension) {
   aura::Window* root_window = GetHost()->window();
 
-  app_window_.reset(new ShellAppWindow);
-  app_window_->Init(context, extension, root_window->bounds().size());
+  shell_app_window_.reset(new ShellAppWindow);
+  shell_app_window_->Init(context, extension, root_window->bounds().size());
 
   // Attach the web contents view to our window hierarchy.
-  aura::Window* content = app_window_->GetNativeWindow();
+  aura::Window* content = shell_app_window_->GetNativeWindow();
   AddAppWindow(content);
   content->Show();
 
-  return app_window_.get();
+  return shell_app_window_.get();
+}
+
+AppWindow* ShellDesktopController::CreateAppWindow(
+    content::BrowserContext* context,
+    const Extension* extension) {
+  app_window_ = new AppWindow(context, new ShellAppDelegate, extension);
+  return app_window_;
 }
 
 void ShellDesktopController::AddAppWindow(aura::Window* window) {
   aura::Window* root_window = GetHost()->window();
   root_window->AddChild(window);
 }
 
 void ShellDesktopController::CloseAppWindows() {
-  app_window_.reset();
+  shell_app_window_.reset();
+  if (app_window_) {
+    app_window_->GetBaseWindow()->Close();  // Close() deletes |app_window_|.
+    app_window_ = NULL;
+  }
 }
 
 aura::Window* ShellDesktopController::GetDefaultParent(
     aura::Window* context,
     aura::Window* window,
     const gfx::Rect& bounds) {
   return host_->window();
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 125 matching lines @@
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions