Hosted apps on OS X now act more like a native app.

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"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_window_registry_util.h"
+#include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/web_applications/web_app_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
+using extensions::ExtensionRegistry;
+
 namespace {
 
 // Gets an item from the main menu given the tag of the top level item
 // |menu_tag| and the tag of the item |item_tag|.
 NSMenuItem* GetItemByTag(NSInteger menu_tag, NSInteger item_tag) {
   return [[[[NSApp mainMenu] itemWithTag:menu_tag] submenu]
       itemWithTag:item_tag];
 }
 
 // Finds a top level menu item using |menu_tag| and creates a new NSMenuItem
@@ skipping 258 matching lines @@
   base::mac::ScopedNSAutoreleasePool pool;
 
   id window = [notification object];
   NSString* name = [notification name];
   if ([name isEqualToString:NSWindowDidBecomeMainNotification]) {
     extensions::AppWindow* appWindow =
         AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
             window);
 
     const extensions::Extension* extension = NULL;
+    // Try and look if there is a relevant app window. Otherwise, look at the

[jackhou1, 2014/12/11 02:43:18]

Maybe something like:

// If there is no corresponding AppWindow, this could be a hosted app, so check
for a Browser.

[mitchellj, 2014/12/12 00:03:45]

Acknowledged.

+    // browser window
     if (appWindow)
       extension = appWindow->GetExtension();
+    else {
+      Browser* browser = chrome::FindBrowserWithWindow(window);
+      if (browser && browser->is_app()) {
+        ExtensionRegistry* registry =
+            ExtensionRegistry::Get(browser->profile());
+        const extensions::Extension* temp = registry->GetExtensionById(
+            web_app::GetExtensionIdFromApplicationName(browser->app_name()),
+            ExtensionRegistry::ENABLED);
+        if (temp->is_hosted_app())
+          extension = temp;
+      }
+    }
 
     if (extension)
       [self addMenuItems:extension];
     else
       [self removeMenuItems];
   } else if ([name isEqualToString:NSWindowWillCloseNotification]) {
     // If there are any other windows that can become main, leave the menu. It
     // will be changed when another window becomes main. Otherwise, restore the
     // Chrome menu.
     for (NSWindow* w : [NSApp windows]) {
@@ skipping 57 matching lines @@
   [hideDoppelganger_ disable];
   [quitDoppelganger_ disable];
   [newDoppelganger_ disable];
   [openDoppelganger_ disable];
 }
 
 - (void)quitCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
-  if (appWindow)
+  if (appWindow) {
     apps::ExtensionAppShimHandler::QuitAppForWindow(appWindow);
+  } else {
+    Browser* browser = chrome::FindBrowserWithWindow([NSApp keyWindow]);
+    if (browser && browser->is_app()) {
+      ExtensionRegistry* registry = ExtensionRegistry::Get(browser->profile());
+      const extensions::Extension* extension = registry->GetExtensionById(
+          web_app::GetExtensionIdFromApplicationName(browser->app_name()),
+          ExtensionRegistry::ENABLED);
+      if (extension->is_hosted_app())
+        apps::ExtensionAppShimHandler::QuitHostedAppForWindow(browser,
+                                                              extension);
+    }
+  }
 }
 
 - (void)hideCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
-  if (appWindow)
+  if (appWindow) {
     apps::ExtensionAppShimHandler::HideAppForWindow(appWindow);
+  } else {
+    Browser* browser = chrome::FindBrowserWithWindow([NSApp keyWindow]);
+    if (browser && browser->is_app()) {

[jackhou1, 2014/12/11 02:43:18]

This logic of "browser->is_app() && extension->is_hosted_app()" gets repeated a
fair big, maybe we could factor it out. Maybe make it a static function in
ExtensionAppShimHandler, since this logic is used there as well.

[mitchellj, 2014/12/12 00:03:45]

Done.

+      ExtensionRegistry* registry = ExtensionRegistry::Get(browser->profile());
+      const extensions::Extension* extension = registry->GetExtensionById(
+          web_app::GetExtensionIdFromApplicationName(browser->app_name()),
+          ExtensionRegistry::ENABLED);
+      if (extension->is_hosted_app())
+        apps::ExtensionAppShimHandler::HideHostedApp(browser->profile(),
+                                                     extension->id());
+    }
+  }
 }
 
 - (void)focusCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (appWindow)
     apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);
 }
 
 @end