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

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/app_host_installer.h"
 #include "chrome/browser/extensions/convert_user_script.h"
 #include "chrome/browser/extensions/convert_web_app.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/requirements_checker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
@@ skipping 416 matching lines @@
 
   current_version_ =
       frontend_weak_->extension_prefs()->GetVersionString(extension_->id());
 
   if (client_ && (!allow_silent_install_ || !approved_)) {
     AddRef();  // Balanced in Proceed() and Abort().
     client_->ConfirmInstall(this, extension_.get());
   } else {
     if (!BrowserThread::PostTask(
             BrowserThread::FILE, FROM_HERE,
-            base::Bind(&CrxInstaller::CompleteInstall, this)))
+            base::Bind(&CrxInstaller::BeginInstall, this)))
       NOTREACHED();
   }
   return;
 }
 
 void CrxInstaller::InstallUIProceed() {
   if (!BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
-          base::Bind(&CrxInstaller::CompleteInstall, this)))
+          base::Bind(&CrxInstaller::BeginInstall, this)))
     NOTREACHED();
 
   Release();  // balanced in ConfirmInstall().
 }
 
 void CrxInstaller::InstallUIAbort(bool user_initiated) {
   std::string histogram_name = user_initiated ?
       "Extensions.Permissions_InstallCancel" :
       "Extensions.Permissions_InstallAbort";
   ExtensionService::RecordPermissionMessagesHistogram(
       extension_, histogram_name.c_str());
 
   // Kill the theme loading bubble.
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(chrome::NOTIFICATION_NO_THEME_DETECTED,
                   content::Source<CrxInstaller>(this),
                   content::NotificationService::NoDetails());
 
   NotifyCrxInstallComplete(NULL);
 
   Release();  // balanced in ConfirmInstall().
 
   // We're done. Since we don't post any more tasks to ourself, our ref count
   // should go to zero and we die. The destructor will clean up the temp dir.
 }
 
-void CrxInstaller::CompleteInstall() {
+void CrxInstaller::BeginInstall() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!current_version_.empty()) {
     Version current_version(current_version_);
     if (current_version.CompareTo(*(extension_->version())) > 0) {
       ReportFailureFromFileThread(
           CrxInstallerError(
               l10n_util::GetStringUTF16(extension_->is_app() ?
                   IDS_APP_CANT_DOWNGRADE_VERSION :
                   IDS_EXTENSION_CANT_DOWNGRADE_VERSION)));
       return;
     }
   }
+  if (AppHostInstaller::IsAppHostInstallRequired(*extension_)) {
+    app_host_installer_.InstallAppHost(
+        base::Bind(&CrxInstaller::OnAppHostInstallation, this));

[benwells, 2012/10/04 07:53:01]

early return here and remove the else

[huangs, 2012/10/04 22:56:42]

Done.

+  } else {
+    CompleteInstall();
+  }
+}
+
+void CrxInstaller::OnAppHostInstallation(bool success) {

[erikwright (departed), 2012/10/04 01:28:16]

OnAppHostInstallationComplete

[huangs, 2012/10/04 22:56:42]

Done.

+  if (success) {
+    CompleteInstall();

[benwells, 2012/10/04 07:53:01]

Early return and remove the else

[huangs, 2012/10/04 22:56:42]

Done.

+  } else {
+    // TODO(huangs): Error message.

[benwells, 2012/10/04 07:53:01]

I take it you'll remove this TODO / fix the error before committing?

[huangs, 2012/10/04 22:56:42]

Done.

+    string16 error = L"Some random error message";
+    ReportFailureFromFileThread(CrxInstallerError(error));
+  }
+}
+
+void CrxInstaller::CompleteInstall() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // See how long extension install paths are.  This is important on
   // windows, because file operations may fail if the path to a file
   // exceeds a small constant.  See crbug.com/69693 .
   UMA_HISTOGRAM_CUSTOM_COUNTS(
     "Extensions.CrxInstallDirPathLength",
         install_directory_.value().length(), 0, 500, 100);
 
   FilePath version_dir = extension_file_util::InstallExtension(
       unpacked_extension_root_,
@@ skipping 130 matching lines @@
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
       content::Details<const Extension>(extension));
 }
 
 }  // namespace extensions