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

chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_
 #define CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
 #include "apps/app_lifetime_monitor.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 
 class Profile;
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class AppWindow;
 class Extension;
 }
 
 namespace apps {
 
 // This app shim handler that handles events for app shims that correspond to an
 // extension.
 class ExtensionAppShimHandler : public AppShimHandler,
                                 public content::NotificationObserver,
-                                public AppLifetimeMonitor::Observer {
+                                public AppLifetimeMonitor::Observer,
+                                public chrome::BrowserListObserver {
  public:
   class Delegate {
    public:
     virtual ~Delegate() {}
 
     virtual bool ProfileExistsForPath(const base::FilePath& path);
     virtual Profile* ProfileForPath(const base::FilePath& path);
     virtual void LoadProfileAsync(const base::FilePath& path,
                                   base::Callback<void(Profile*)> callback);
 
@@ skipping 15 matching lines @@
     virtual void MaybeTerminate();
   };
 
   ExtensionAppShimHandler();
   ~ExtensionAppShimHandler() override;
 
   AppShimHandler::Host* FindHost(Profile* profile, const std::string& app_id);
 
   static void QuitAppForWindow(extensions::AppWindow* app_window);
 
+  static void QuitHostedAppForWindow(Browser* browser,
+                                     const extensions::Extension* extension);
+
   static void HideAppForWindow(extensions::AppWindow* app_window);
 
+  static void HideHostedApp(Profile* profile, const std::string& app_id);
+
+  void SetHostedAppHidden(Profile* profile,

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

Move this below FindHost.

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

Done.

+                          const std::string& app_id,
+                          bool hidden);
+
   static void FocusAppForWindow(extensions::AppWindow* app_window);
 
+  const static extensions::Extension* GetAppExtension(

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

s/const static/static const/

Also move this so that it's the first static (and move the definition as well).

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

Done.

+      Profile* profile,
+      const std::string& extension_id);
+
   // Brings the window to the front without showing it and instructs the shim to
   // request user attention. If there is no shim, show the app and return false.
   static bool ActivateAndRequestUserAttentionForWindow(
       extensions::AppWindow* app_window);
 
   // Instructs the shim to request user attention. Returns false if there is no
   // shim for this window.
   static void RequestUserAttentionForWindow(
       extensions::AppWindow* app_window,
       AppShimAttentionType attention_type);
@@ skipping 17 matching lines @@
   void OnAppActivated(Profile* profile, const std::string& app_id) override;
   void OnAppDeactivated(Profile* profile, const std::string& app_id) override;
   void OnAppStop(Profile* profile, const std::string& app_id) override;
   void OnChromeTerminating() override;
 
   // content::NotificationObserver overrides:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
+  // chrome::BrowserListObserver overrides;
+  void OnBrowserAdded(Browser* browser) override;
+  void OnBrowserRemoved(Browser* browser) override;
+
  protected:
   typedef std::map<std::pair<Profile*, std::string>, AppShimHandler::Host*>
       HostMap;
+  typedef std::set<Browser*> BrowserSet;
+  typedef std::map<std::string, BrowserSet> AppBrowserMap;
 
   // Exposed for testing.
   void set_delegate(Delegate* delegate);
   HostMap& hosts() { return hosts_; }
   content::NotificationRegistrar& registrar() { return registrar_; }
 
  private:
   // Helper function to get the instance on the browser process.
   static ExtensionAppShimHandler* GetInstance();
 
   // This is passed to Delegate::LoadProfileAsync for shim-initiated launches
   // where the profile was not yet loaded.
   void OnProfileLoaded(Host* host,
                        AppShimLaunchType launch_type,
                        const std::vector<base::FilePath>& files,
                        Profile* profile);
 
   // This is passed to Delegate::EnableViaPrompt for shim-initiated launches
   // where the extension is disabled.
   void OnExtensionEnabled(const base::FilePath& profile_path,
                           const std::string& app_id,
                           const std::vector<base::FilePath>& files);
 
   scoped_ptr<Delegate> delegate_;
 
   HostMap hosts_;
 
+  // A map of app ids to associated browser windows.
+  AppBrowserMap app_browser_windows_;
+
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<ExtensionAppShimHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppShimHandler);
 };
 
 }  // namespace apps
 
 #endif  // CHROME_BROWSER_APPS_APP_SHIM_EXTENSION_APP_SHIM_HANDLER_MAC_H_