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

chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
index 5176e9c5121fb06f08cbd6316ab78483bd79c5e4..21235700d3712d7e98a584de5c88bbee6d10fd53 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
@@ -10,7 +10,11 @@
 #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/common/extension.h"
@@ -295,8 +299,21 @@ void AddDuplicateItem(NSMenuItem* top_level_item,
             window);
 
     const extensions::Extension* extension = NULL;
+    // If there is no corresponding AppWindow, this could be a hosted app, so
+    // check for a browser.
     if (appWindow)
       extension = appWindow->GetExtension();
+    else {
+      Browser* browser = chrome::FindBrowserWithWindow(window);
+      if (browser && browser->is_app()) {
+        const extensions::Extension* temp =
+            apps::ExtensionAppShimHandler::GetAppExtension(

[jackhou1, 2014/12/12 00:48:29]

You can assign this directly to |extension|.

[mitchellj, 2014/12/12 03:46:23]

Done.

+                browser->profile(), web_app::GetExtensionIdFromApplicationName(
+                                        browser->app_name()));
+        if (temp)
+          extension = temp;
+      }
+    }
 
     if (extension)
       [self addMenuItems:extension];
@@ -374,16 +391,41 @@ void AddDuplicateItem(NSMenuItem* top_level_item,
   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())

[jackhou1, 2014/12/12 00:48:29]

What do you think of adding something like 

const Extension* ExtensionAppShimHandler::GetAppForBrowser(Browser*);

It can check Browser::is_app() and then call GetAppExtension()?

[mitchellj, 2014/12/12 03:46:23]

Done.

+      return;
+
+    const extensions::Extension* extension =
+        apps::ExtensionAppShimHandler::GetAppExtension(
+            browser->profile(),
+            web_app::GetExtensionIdFromApplicationName(browser->app_name()));
+    if (extension)
+      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())
+      return;
+
+    const extensions::Extension* extension =
+        apps::ExtensionAppShimHandler::GetAppExtension(
+            browser->profile(),
+            web_app::GetExtensionIdFromApplicationName(browser->app_name()));
+    if (extension)
+      apps::ExtensionAppShimHandler::HideHostedApp(browser->profile(),
+                                                   extension->id());
+  }
 }
 
 - (void)focusCurrentPlatformApp {