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

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

Issue 6951016: Product-specific flags are no longer required, used, or validated in --rename-chrome-exe command ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
« no previous file with comments | « no previous file | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
===================================================================
--- chrome/installer/setup/install_worker.cc (revision 84528)
+++ chrome/installer/setup/install_worker.cc (working copy)
@@ -423,6 +423,8 @@
rename.AppendSwitch(switches::kRenameChromeExe);
if (installer_state.system_install())
rename.AppendSwitch(switches::kSystemLevel);
+ if (installer_state.is_multi_install())
+ rename.AppendSwitch(switches::kMultiInstall);
if (installer_state.verbose_logging())
rename.AppendSwitch(switches::kVerboseLogging);
@@ -440,16 +442,14 @@
// Adding this registry entry for all products is overkill.
// However, as it stands, we don't have a way to know which distribution
- // will check the key and run the command, so we add it for all.
- // After the first run, the subsequent runs should just be noops.
- // (see upgrade_utils::SwapNewChromeExeIfPresent).
- CommandLine product_rename_cmd(rename);
- products[i]->AppendProductFlags(&product_rename_cmd);
+ // will check the key and run the command, so we add it for all. The
+ // first to run it will perform the operation and clean up the other
+ // values.
in_use_update_work_items->AddSetRegValueWorkItem(
root,
version_key,
google_update::kRegRenameCmdField,
- product_rename_cmd.command_line_string(),
+ rename.command_line_string(),
true);
}
« no previous file with comments | « no previous file | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698