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"
@@ skipping 33 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/extensions/app_host_installer_win.h"
+#endif
+
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace extensions {
 
 namespace {
 
 // Used in histograms; do not change order.
 enum OffStoreInstallDecision {
   OnStoreInstall,
@@ skipping 437 matching lines @@
     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 defined(OS_WIN)

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

This part of the codebase is platform independent. We can get rid of these #if
checks and have this code all generic with some small tweaks. This would then
let us add a similar concept to linux and / or mac later on.

To do this app_host_installer_win.h should become app_host_installer.h, with
it's implementation changing based on what platform we are on (either via #if or
the linker, but #if should be fine for now).

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

Done.

+  if (extension_->is_platform_app()) {
+    // Ensures that App Host is present.
+    // Will call CompleteExtensionInstall() after.
+    // TODO(huangs): Should this be Unretained, or not?
+    app_host_installer_.EnsureAppHostPresentAndCall(
+        base::Bind(&CrxInstaller::CompleteExtensionInstall,
+                   base::Unretained(this)),
+        base::Bind(&CrxInstaller::OnAppHostInstallFailure,
+                   base::Unretained(this)));
+  } else {
+    CompleteExtensionInstall();
+  }
 
+#else
+  CompleteExtensionInstall();
+#endif
+}
+
+void CrxInstaller::CompleteExtensionInstall() {
   // 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_,
       extension_->id(),
@@ skipping 24 matching lines @@
 
   if (extension_) {
     ReportSuccessFromFileThread();
   } else {
     LOG(ERROR) << error << " " << extension_id << " " << download_url_.spec();
     ReportFailureFromFileThread(CrxInstallerError(UTF8ToUTF16(error)));
   }
 
 }
 
+#if defined(OS_WIN)
+void CrxInstaller::OnAppHostInstallFailure() {
+  string16 error = L"Some random error message";

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

Ah, you did say work in progress....

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

Yup.  I moved this routine.

+  ReportFailureFromFileThread(CrxInstallerError(error));
+}
+#endif
+
 void CrxInstaller::ReportFailureFromFileThread(const CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(&CrxInstaller::ReportFailureFromUIThread, this, error))) {
     NOTREACHED();
   }
 }
 
 void CrxInstaller::ReportFailureFromUIThread(const CrxInstallerError& error) {
@@ skipping 85 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