Close AppWindow to perform clean shutdown

athena/main/athena_main.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 "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/athena_content_client.h"
@@ skipping 33 matching lines @@
  public:
   AthenaDesktopController() {}
   virtual ~AthenaDesktopController() {}
 
  private:
   // extensions::DesktopController:
   virtual aura::WindowTreeHost* GetHost() OVERRIDE {
     return athena::AthenaEnv::Get()->GetHost();
   }
 
-  // Creates a new app window and adds it to the desktop. The desktop maintains
-  // ownership of the window.
-  virtual extensions::ShellAppWindow* CreateAppWindow(
+  // Creates a new ShellAppWindow and adds it to the desktop. The desktop
+  // maintains ownership of the window.
+  virtual extensions::ShellAppWindow* CreateShellAppWindow(
       content::BrowserContext* context,
       const extensions::Extension* extension) OVERRIDE {
     extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();
     app_window->Init(context, extension, gfx::Size(100, 100));
     athena::ActivityManager::Get()->AddActivity(
         athena::ActivityFactory::Get()->CreateAppActivity(app_window,
                                                           extension->id()));
     return app_window;
   }
 
+  // Creates a new app window and adds it to the desktop. The desktop maintains

[James Cook, 2014/09/08 18:14:31]

The desktop maintains ownership? I thought it had a non-owning pointer?

+  // ownership of the window.
+  virtual extensions::AppWindow* CreateAppWindow(
+      content::BrowserContext* context,
+      const extensions::Extension* extension) OVERRIDE {
+    NOTIMPLEMENTED();
+    return NULL;
+  }
+
   // Adds the window to the desktop.
   virtual void AddAppWindow(aura::Window* window) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
   // Closes and destroys the app windows.
   virtual void CloseAppWindows() OVERRIDE {}
 
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
@@ skipping 111 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }