Make application shortcuts point to app_host.exe, install App Host during app installation.

chrome/browser/extensions/app_shortcut_manager.h

Index: chrome/browser/extensions/app_shortcut_manager.h
diff --git a/chrome/browser/extensions/app_shortcut_manager.h b/chrome/browser/extensions/app_shortcut_manager.h
index bc78b24e953673bb06f1e8cf1804ce81aeaf0016..2f006e10a0b50760f44be29a5a5b1dec711f94e5 100644
--- a/chrome/browser/extensions/app_shortcut_manager.h
+++ b/chrome/browser/extensions/app_shortcut_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_APP_SHORTCUT_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_APP_SHORTCUT_MANAGER_H_
 
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/extensions/extension.h"
@@ -21,6 +22,8 @@ class AppShortcutManager : public ImageLoadingTracker::Observer,
  public:
   explicit AppShortcutManager(Profile* profile);
 
+  virtual ~AppShortcutManager();
+
   // Implement ImageLoadingTracker::Observer. |tracker_| is used to
   // load the application's icon, which is done when we start creating an
   // application's shortcuts. This method receives the icon, and completes
@@ -36,6 +39,12 @@ class AppShortcutManager : public ImageLoadingTracker::Observer,
 
  private:
   void UpdateApplicationShortcuts(const Extension* extension);
+
+#if defined(OS_WIN)
+  void OnAppHostInstallationComplete(const Extension* extension,
+                                     bool app_host_install_success);
+#endif
+
   void DeleteApplicationShortcuts(const Extension* extension);
 
   content::NotificationRegistrar registrar_;
@@ -45,6 +54,8 @@ class AppShortcutManager : public ImageLoadingTracker::Observer,
   ShellIntegration::ShortcutInfo shortcut_info_;
   ImageLoadingTracker tracker_;
 
+  base::WeakPtrFactory<AppShortcutManager> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(AppShortcutManager);
 };