Chromium Code Reviews| Index: chrome/installer/setup/install.cc |
| diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc |
| index 5049fdca81bcbfedbcbf4d959a6b40c6fbcd82d2..92d1e0769cbac53c59cb65ef4286df76e0d30ca3 100644 |
| --- a/chrome/installer/setup/install.cc |
| +++ b/chrome/installer/setup/install.cc |
| @@ -77,8 +77,8 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location, |
| case ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH: |
| message.append("Quick Launch "); |
| break; |
| - case ShellUtil::SHORTCUT_LOCATION_START_MENU: |
| - message.append("Start menu "); |
| + case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR: |
| + message.append("Start menu/Google Chrome "); |
|
grt (UTC plus 2)
2013/10/22 13:37:45
this portion of the message will be incorrect for
calamity
2013/11/20 05:43:30
Done.
|
| break; |
| default: |
|
huangs
2013/10/17 19:13:35
Also handle SHORTCUT_LOCATION_START_MENU_CHROME_AP
calamity
2013/11/20 05:43:30
Done.
|
| NOTREACHED(); |
| @@ -254,8 +254,8 @@ void CleanupLegacyShortcuts(const InstallerState& installer_state, |
| ShellUtil::ShellChange shortcut_level = installer_state.system_install() ? |
| ShellUtil::SYSTEM_LEVEL : ShellUtil::CURRENT_USER; |
| base::FilePath uninstall_shortcut_path; |
| - ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU, dist, |
| - shortcut_level, &uninstall_shortcut_path); |
| + ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, |
| + dist, shortcut_level, &uninstall_shortcut_path); |
| uninstall_shortcut_path = uninstall_shortcut_path.Append( |
| dist->GetUninstallLinkName() + installer::kLnkExt); |
| base::DeleteFile(uninstall_shortcut_path, false); |
| @@ -457,9 +457,9 @@ void CreateOrUpdateShortcuts( |
| ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL)) { |
| start_menu_properties.set_pin_to_taskbar(true); |
| } |
| - ExecuteAndLogShortcutOperation(ShellUtil::SHORTCUT_LOCATION_START_MENU, |
| - dist, start_menu_properties, |
| - shortcut_operation); |
| + ExecuteAndLogShortcutOperation( |
| + ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist, |
| + start_menu_properties, shortcut_operation); |
| } |
| void RegisterChromeOnMachine(const InstallerState& installer_state, |