Close all windows when app shim quits.

apps/app_shim/extension_app_shim_handler_mac.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 "apps/app_shim/extension_app_shim_handler_mac.h"
 
 #include "apps/app_shim/app_shim_messages.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "ui/base/cocoa/focus_window_set.h"
 
 namespace apps {
 
 ExtensionAppShimHandler::ExtensionAppShimHandler() {}
 
 ExtensionAppShimHandler::~ExtensionAppShimHandler() {
   for (HostMap::iterator it = hosts_.begin(); it != hosts_.end(); ) {
     // Increment the iterator first as OnAppClosed may call back to OnShimClose
@@ skipping 41 matching lines @@
 
 void ExtensionAppShimHandler::OnShimFocus(Host* host) {
   if (!host->GetProfile())
     return;
 
   extensions::ShellWindowRegistry* registry =
       extensions::ShellWindowRegistry::Get(host->GetProfile());
   const extensions::ShellWindowRegistry::ShellWindowList windows =
       registry->GetShellWindowsForApp(host->GetAppId());
   std::set<gfx::NativeWindow> native_windows;
-  for (extensions::ShellWindowRegistry::const_iterator i = windows.begin();
-       i != windows.end(); ++i) {
-    native_windows.insert((*i)->GetNativeWindow());
+  for (extensions::ShellWindowRegistry::const_iterator it = windows.begin();
+       it != windows.end(); ++it) {
+    native_windows.insert((*it)->GetNativeWindow());
   }
   ui::FocusWindowSet(native_windows);
 }
 
+void ExtensionAppShimHandler::OnShimQuit(Host* host) {
+  if (!host->GetProfile())
+    return;
+
+  extensions::ShellWindowRegistry::ShellWindowList windows =
+      extensions::ShellWindowRegistry::Get(host->GetProfile())->
+          GetShellWindowsForApp(host->GetAppId());
+  for (extensions::ShellWindowRegistry::const_iterator it = windows.begin();
+       it != windows.end(); ++it) {
+    (*it)->GetBaseWindow()->Close();
+  }
+}
+
 bool ExtensionAppShimHandler::LaunchApp(Profile* profile,
                                         const std::string& app_id) {
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile);
   ExtensionServiceInterface* extension_service =
       extension_system->extension_service();
   const extensions::Extension* extension =
       extension_service->GetExtensionById(app_id, false);
   if (!extension) {
     LOG(ERROR) << "Attempted to launch nonexistent app with id '"
@@ skipping 28 matching lines @@
 }
 
 void ExtensionAppShimHandler::CloseShim(Profile* profile,
                                         const std::string& app_id) {
   HostMap::const_iterator it = hosts_.find(make_pair(profile, app_id));
   if (it != hosts_.end())
     it->second->OnAppClosed();
 }
 
 }  // namespace apps