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

chrome/browser/extensions/app_shortcut_manager.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/app_shortcut_manager.h"
 
+#include "base/bind.h"
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/extensions/app_host_installer_win.h"
+#endif
+
 namespace extensions {
 
 namespace {
 
 #if defined(OS_MACOSX)
 const int kDesiredSizes[] = {16, 32, 128, 256, 512};
 #else
 const int kDesiredSizes[] = {32};
 #endif
 
@@ skipping 44 matching lines @@
 }
 
 void AppShortcutManager::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
 #if !defined(OS_MACOSX)
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_INSTALLED: {
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
-      if (extension->is_platform_app())
+      if (extension->is_platform_app()) {
+#if defined(OS_WIN)
+        extensions::AppHostInstaller::EnsureAppHostInstalled(
+            base::Bind(&AppShortcutManager::OnAppHostInstallationComplete,
+                       base::Unretained(this), extension));

[erikwright (departed), 2012/11/02 18:56:38]

For safety the instance pointer should be a weak pointer to 'this'.

Add a WeakPtrFactory<AppShortcutManager> member, initialize it with 'this', and
then use it to create a weak pointer.

[huangs, 2012/11/02 20:22:36]

Done.

+#else
         UpdateApplicationShortcuts(extension);
+#endif
+      }
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
       DeleteApplicationShortcuts(extension);
       break;
     }
     default:
       NOTREACHED();
   }
 #endif
 }
 
+#if defined(OS_WIN)
+void AppShortcutManager::OnAppHostInstallationComplete(
+    const Extension* extension, bool app_host_install_success) {
+  if (!app_host_install_success) {
+    // Do not create shortcuts if App Host fails to install.
+    LOG(ERROR) << "Application Runtime installation failed.";
+    return;
+  }
+  UpdateApplicationShortcuts(extension);
+}
+#endif
+
 void AppShortcutManager::UpdateApplicationShortcuts(
     const Extension* extension) {
   shortcut_info_ = ShortcutInfoForExtensionAndProfile(extension, profile_);
 
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   for (size_t i = 0; i < arraysize(kDesiredSizes); ++i) {
     int size = kDesiredSizes[i];
     ExtensionResource resource = extension->GetIconResource(
         size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
@@ skipping 32 matching lines @@
 }
 
 void AppShortcutManager::DeleteApplicationShortcuts(
     const Extension* extension) {
   ShellIntegration::ShortcutInfo delete_info =
       ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }
 
 }  // namespace extensions