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

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

Issue 11267023: Implementing --app-launcher install/uninstall flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing shortcut install (will do in different CL), but keeping some refactoring. Created 8 years, 2 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 2f4029c64e99a52944df42e07fec087eb199eb6c..89de9adea1716fb20993866cdc6f3b0340b4a167 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -350,23 +350,23 @@ void CreateOrUpdateShortcuts(const InstallerState& installer_state,
DCHECK(product.is_chrome());
BrowserDistribution* dist = product.distribution();
- const FilePath chrome_exe(
- installer_state.target_path().Append(installer::kChromeExe));
ShellUtil::ShellChange install_level =
installer_state.system_install() ? ShellUtil::SYSTEM_LEVEL :
ShellUtil::CURRENT_USER;
+ // |base_properties|: The basic properties to set on every shortcut installed
grt (UTC plus 2) 2012/10/30 13:02:55 please revert all shortcut-related changes if you'
erikwright (departed) 2012/10/30 14:20:39 Feel free to ask for help to split them into a sep
huangs 2012/10/30 20:35:07 Will remove the "if". The rest is just minor clea
gab 2012/10/30 21:30:40 I don't see how the changes in install.cc/uninstal
huangs 2012/10/30 21:38:39 I didn't want these trivial changes to add visual
erikwright (departed) 2012/10/30 22:53:52 If the changes are good refactorings that stand on
+ // (to be refined on a per-shortcut basis).
+ ShellUtil::ChromeShortcutProperties base_properties(install_level);
+
+ if (product.is_chrome()) {
+ base_properties.set_chrome_exe(
+ installer_state.target_path().Append(installer::kChromeExe));
+ }
// The default operation on update is to overwrite shortcuts with the
// currently desired properties, but do so only for shortcuts that still
// exist.
ShellUtil::ChromeShortcutOperation shortcut_operation =
ShellUtil::SHORTCUT_REPLACE_EXISTING;
-
- // |base_properties|: The basic properties to set on every shortcut installed
- // (to be refined on a per-shortcut basis).
- ShellUtil::ChromeShortcutProperties base_properties(install_level);
- base_properties.set_chrome_exe(chrome_exe);
-
// If |install_operation| is INSTALL_SHORTCUT_CREATE_ALL, create optional
// shortcuts (Desktop and Quick Launch) immediately; otherwise delay their
// creation until first run.
@@ -401,7 +401,7 @@ void CreateOrUpdateShortcuts(const InstallerState& installer_state,
ShellUtil::ChromeShortcutProperties start_menu_properties(base_properties);
// IMPORTANT: Only the default (no arguments and default browserappid) browser
- // shortcut in the Start menu (Start screen on Win8+) should be made dual
+ // shortcut in the Start menu (Start screen on Win8+) should be made dual
// mode.
start_menu_properties.set_dual_mode(true);
if (shortcut_operation == ShellUtil::SHORTCUT_CREATE_ALWAYS)

Powered by Google App Engine
This is Rietveld 408576698