Close AppWindow to perform clean shutdown

extensions/shell/browser/shell_desktop_controller.h

 // 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.
 
 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 50 matching lines @@
                                public chromeos::PowerManagerClient::Observer,
                                public ui::DisplayConfigurator::Observer,
 #endif
                                public aura::WindowTreeHostObserver {
  public:
   ShellDesktopController();
   virtual ~ShellDesktopController();
 
   // DesktopController:
   virtual aura::WindowTreeHost* GetHost() OVERRIDE;
-  virtual ShellAppWindow* CreateAppWindow(content::BrowserContext* context,
-                                          const Extension* extension) OVERRIDE;
+  virtual ShellAppWindow* CreateShellAppWindow(
+      content::BrowserContext* context,
+      const Extension* extension) OVERRIDE;
+  virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
+                                     const Extension* extension) OVERRIDE;
   virtual void AddAppWindow(aura::Window* window) OVERRIDE;
   virtual void CloseAppWindows() OVERRIDE;
 
   // aura::client::WindowTreeClient overrides:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   // chromeos::PowerManagerClient::Observer overrides:
@@ skipping 42 matching lines @@
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
   scoped_ptr<wm::CursorManager> cursor_manager_;
 
   scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
 
   // The desktop supports a single app window.
-  scoped_ptr<ShellAppWindow> app_window_;
+  scoped_ptr<ShellAppWindow> shell_app_window_;
+  AppWindow* app_window_;  // NativeAppWindow::Close() deletes this.
 
   DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_