Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: chrome/installer/setup/install.cc

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix
Patch Set: rebase, move app launcher and chrome app strings into the installer Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index b8ebe94fd372897dac60815ae6fae078910fd018..9121751cce375802f9d576fcc376479dacc37e66 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -76,7 +76,7 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location,
case ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH:
message.append("Quick Launch ");
break;
- case ShellUtil::SHORTCUT_LOCATION_START_MENU:
+ case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR:
message.append("Start menu ");
gab 2013/05/15 21:26:38 s/"Start menu "/"Start menu/Google Chrome "
calamity 2013/08/27 07:59:35 Done.
break;
default:
@@ -253,8 +253,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);
file_util::Delete(uninstall_shortcut_path, false);
@@ -450,9 +450,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,

Powered by Google App Engine
This is Rietveld 408576698