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

chrome/browser/extensions/crx_installer.h

Index: chrome/browser/extensions/crx_installer.h
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index e9541dec8204defc135dbc6dfef30595eab22ef2..19bf32112eb64b5201fa5957612c605cf0260c32 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -20,6 +20,10 @@
 #include "chrome/common/web_apps.h"
 #include "sync/api/string_ordinal.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/extensions/app_host_installer_win.h"
+#endif
+
 class ExtensionService;
 class SkBitmap;
 
@@ -214,10 +218,18 @@ class CrxInstaller
   // that it is OK to install this extension.
   void ConfirmInstall();
 
-  // Runs on File thread. Install the unpacked extension into the profile and
-  // notify the frontend.
+  // Runs on File thread. Ensures that App Host is installed, and then
+  // proceeds to post CompleteExtensionInstall().
   void CompleteInstall();
 
+  // Runs on File thread. Installs the unpacked extension into the profile and
+  // notifies the frontend.
+  void CompleteExtensionInstall();

[benwells, 2012/10/03 05:08:43]

Please come up with a better name for this function. There is CompleteInstall
and CompleteExtensionInstall, how are they different?

From a quick glance, maybe CompleteInstall should be CheckEnvironmentAndInstall,
and CompleteExtensionInstall CompleteInstall. Or maybe you can come up with
something better.

[erikwright (departed), 2012/10/03 15:58:35]

Naming is hell.

How about

CompleteInstall->BeginInstall
CompleteExtensionInstall->CompleteInstall

[huangs, 2012/10/03 20:09:47]

Done.

[huangs, 2012/10/03 20:09:47]

Done.

+
+#if defined(OS_WIN)
+  void OnAppHostInstallFailure();
+#endif
+
   // Result reporting.
   void ReportFailureFromFileThread(const CrxInstallerError& error);
   void ReportFailureFromUIThread(const CrxInstallerError& error);
@@ -359,6 +371,10 @@ class CrxInstaller
 
   bool has_requirement_errors_;
 
+#if defined(OS_WIN)
+  AppHostInstaller app_host_installer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };