Migrate app_host.exe shortcuts to chrome.exe shortcuts

chrome/browser/shell_integration.h

Index: chrome/browser/shell_integration.h
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index 25232f7bc882f96e192008df05570ee227601f16..da7d0619883449b0f479e3ca4dadacdadf8ae73f 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -169,6 +169,10 @@ class ShellIntegration {
   // for the taskbar group on Win 7.
   static string16 GetChromiumIconLocation();
 
+  // Calls MigrateAppHostShortcuts() and MigrateChromiumShortcuts() in that
+  // order after a delay.
+  static void MigrateShortcuts();
+
   // Migrates existing chrome shortcuts by tagging them with correct app id.
   // see http://crbug.com/28104
   static void MigrateChromiumShortcuts();
@@ -184,6 +188,17 @@ class ShellIntegration {
                                             const base::FilePath& path,
                                             bool check_dual_mode);
 
+  // Migrates app host shortcuts to point to chrome.exe instead.
+  static void MigrateAppHostShortcuts();

[gab, 2013/04/19 18:34:50]

This shouldn't be done in Chrome, instead it should be done in the installer;
where the shortcuts are created. The installer already has all the functionality
to update existing shortcut properties.

Furthermore Chrome (the product not the binaries) might not be installed even if
the App Launcher is installed.

+
+  // Migrates shortcuts in |path| that point to |app_host_exe| to point to
+  // |chrome_exe|, finding shortcuts recursively if |recursive| is true.
+  static int MigrateAppHostShortcutsInPathInternal(
+      const base::FilePath& chrome_exe,
+      const base::FilePath& app_host_exe,
+      const base::FilePath& path,
+      bool recursive);
+
   // Returns the path to the Start Menu shortcut for the given Chrome.
   static base::FilePath GetStartMenuShortcut(const base::FilePath& chrome_exe);
 #endif  // defined(OS_WIN)