Make OSX App Launcher Launchable from the Dock.

apps/app_shim/app_shim_host_mac.h

Index: apps/app_shim/app_shim_host_mac.h
diff --git a/apps/app_shim/app_shim_host_mac.h b/apps/app_shim/app_shim_host_mac.h
index fbfd0fa2573d7899fbe6bddec661dbe49bca348b..2cc3c87cb780a5396e9a67e43c150527c45a1154 100644
--- a/apps/app_shim/app_shim_host_mac.h
+++ b/apps/app_shim/app_shim_host_mac.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "chrome/browser/ui/app_list/app_list_dismiss_observer_mac.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ipc/ipc_listener.h"
@@ -28,6 +29,7 @@ class Message;
 // connected to the app shim is closed.
 class AppShimHost : public IPC::Listener,
                     public IPC::Sender,
+                    public chrome::AppListDismissObserverMac,
                     public content::NotificationObserver,
                     public base::NonThreadSafe {
  public:
@@ -49,6 +51,7 @@ class AppShimHost : public IPC::Listener,
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
@@ -60,6 +63,9 @@ class AppShimHost : public IPC::Listener,
   // app shim to send multiple launch messages.
   void OnLaunchApp(std::string profile, std::string app_id);
 
+  // The app shim process is requesting that the app list should be shown.
+  void OnLaunchAppList();
+
   // Called when the app shim process notifies that the app should be brought
   // to the front (i.e. the user has clicked on the app's icon in the dock or
   // Cmd+Tabbed to it.)
@@ -74,12 +80,16 @@ class AppShimHost : public IPC::Listener,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // AppListDismissObserverMac override:
+  virtual void OnAppListDismissed() OVERRIDE;
+
   // Closes the channel and destroys the AppShimHost.
   void Close();
 
   scoped_ptr<IPC::ChannelProxy> channel_;
   std::string app_id_;
   Profile* profile_;
+  bool is_app_list_;
   content::NotificationRegistrar registrar_;
 };