Close all windows when app shim quits.

apps/app_shim/extension_app_shim_handler_mac.mm

 // 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"
 
+#import <Cocoa/Cocoa.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/shell_window.h"
+#include "content/public/browser/web_contents.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
     // and invalidate the iterator.
@@ skipping 40 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();

[tapted, 2013/05/24 08:43:51]

perhaps name this iterator `it` to be consistent (and I like it better than
`i`).

[jackhou1, 2013/05/27 01:02:47]

Done.

        i != windows.end(); ++i) {
     native_windows.insert((*i)->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) {
+    NSWindow* window = (*it)->GetNativeWindow();

[tapted, 2013/05/24 08:43:51]

What about (*it)->GetBaseWindow()->Close();

That should hit the following in native_app_window_cocoa.mm

void NativeAppWindowCocoa::Close() {
  [window() performClose:nil];
}

and would avoid this file having to get infected by Objective C

[jackhou1, 2013/05/27 01:02:47]

Close() is not available on the NativeAppWindow interface. I tried #include
"chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h" here but
presubmit says it's not allowed by checkdeps. Do I add an exception for it? Or
do you think I should add Close() to the interface?

[tapted, 2013/05/27 01:13:56]

Sure it is! -- should be inherited from ui::BaseWindow. What's the error? (I'm
guessing ~use of incomplete object, NativeAppWindow forward-declared <here>)
You shouldn't need this one. But you will probably need 

"chrome/browser/ui/cocoa/extensions/native_app_window.h"

since it's forward-declared in shell_window.h.
I'd add an exception for native_app_window.h. NativeAppWindow belongs in
src/apps (eventually), so I think this is the right thing to do, until that gets
moved.

[jackhou1, 2013/05/27 05:04:51]

Done.

+    [window performClose:nil];
+  }
+}
+
 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