Mac: App menuBars: Ignore closing windows if they are not main

chrome/browser/ui/cocoa/apps/app_shim_menu_controller_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.
 
 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 376 matching lines @@
       extension = appWindow->GetExtension();
     else
       extension = apps::ExtensionAppShimHandler::GetAppForBrowser(
           chrome::FindBrowserWithWindow(window));
 
     if (extension)
       [self addMenuItems:extension];
     else
       [self removeMenuItems];
   } else if ([name isEqualToString:NSWindowWillCloseNotification]) {
-    // Always reset back to the Chrome menu. This once scanned [NSApp windows]
-    // to predict whether we could expect another Chrome window to become main,
-    // and skip the reset. However, panels need to do strange things during
-    // window close to ensure panels never get chosen for key status over a
-    // browser window (which is likely because they are given an elevated
-    // [NSWindow level]). Trying to handle this case is not robust.
-    // Unfortunately, resetting the menu to Chrome unconditionally means that
-    // if another packaged app window becomes key, the menu will flicker.
-    // TODO(tapted): Investigate restoring the logic when the panel code is
-    // removed.
-    [self removeMenuItems];
+    // If the window being closed has main status, reset back to the Chrome
+    // menu. This once scanned [NSApp windows] to predict whether we could
+    // expect another Chrome window to become main, and skip the reset. However,
+    // panels need to do strange things during window close to ensure panels
+    // never get chosen for key status over a browser window (which is likely
+    // because they are given an elevated [NSWindow level]). Trying to handle
+    // this case is not robust. Unfortunately, resetting the menu to Chrome
+    // unconditionally means that if another packaged app window becomes key,
+    // the menu will flicker. TODO(tapted): Investigate restoring the logic when
+    // the panel code is removed.
+    if ([[notification object] isMainWindow])
+      [self removeMenuItems];
   } else {
     NOTREACHED();
   }
 }
 
 - (void)addMenuItems:(const extensions::Extension*)app {
   NSString* appId = base::SysUTF8ToNSString(app->id());
   NSString* title = base::SysUTF8ToNSString(app->name());
 
   if ([appId_ isEqualToString:appId])
@@ skipping 96 matching lines @@
 
 - (void)focusCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (appWindow)
     apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);
 }
 
 @end