| Index: chrome/installer/setup/install.cc
|
| diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
|
| index a8660d36716ed36d2fa285ad49c7865422742f9e..c6d09574442156f48fcf3ea31609795ae5431183 100644
|
| --- a/chrome/installer/setup/install.cc
|
| +++ b/chrome/installer/setup/install.cc
|
| @@ -27,6 +27,7 @@
|
| #include "chrome/installer/setup/setup_constants.h"
|
| #include "chrome/installer/setup/setup_util.h"
|
| #include "chrome/installer/setup/update_active_setup_version_work_item.h"
|
| +#include "chrome/installer/setup/update_per_user_shortcuts_in_location.h"
|
| #include "chrome/installer/util/beacons.h"
|
| #include "chrome/installer/util/browser_distribution.h"
|
| #include "chrome/installer/util/create_reg_key_work_item.h"
|
| @@ -37,6 +38,7 @@
|
| #include "chrome/installer/util/master_preferences.h"
|
| #include "chrome/installer/util/master_preferences_constants.h"
|
| #include "chrome/installer/util/set_reg_value_work_item.h"
|
| +#include "chrome/installer/util/shell_util.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| #include "chrome/installer/util/work_item.h"
|
| #include "chrome/installer/util/work_item_list.h"
|
| @@ -418,6 +420,21 @@ void CreateOrUpdateShortcuts(
|
| ExecuteAndLogShortcutOperation(
|
| ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
|
| start_menu_properties, shortcut_operation);
|
| +
|
| + // Update the target path of existing per-user shortcuts.
|
| + if (install_operation == INSTALL_SHORTCUT_REPLACE_EXISTING) {
|
| + const base::FilePath updated_prefix = target.DirName().DirName();
|
| + const base::FilePath updated_suffix = target.BaseName();
|
| +
|
| + UpdatePerUserShortcutsInLocation(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist,
|
| + updated_prefix, updated_suffix, target);
|
| + UpdatePerUserShortcutsInLocation(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
|
| + dist, updated_prefix, updated_suffix,
|
| + target);
|
| + UpdatePerUserShortcutsInLocation(ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS,
|
| + dist, updated_prefix, updated_suffix,
|
| + target);
|
| + }
|
| }
|
|
|
| void RegisterChromeOnMachine(const installer::InstallerState& installer_state,
|
|
|