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

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

Issue 10823437: Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactoring; changing return value of --on-os-upgrade flow. Created 8 years, 4 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/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 139b8274e9eb5c81aba8e38593fc0d1b12a05436..8be8e9b28d0fc870529263e389b2b2b51f0ebe59 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1170,6 +1170,17 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
HKEY_LOCAL_MACHINE, suffix, installer_state->target_path(), &tmp);
}
*exit_code = tmp;
+ } else if (cmd_line.HasSwitch(installer::switches::kOnOsUpgrade)) {
+ const Product* chrome_install =
+ installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER);
+ if (chrome_install &&
+ installer::HandleOsUpgradeForBrowser(*installer_state,
+ *chrome_install,
+ cmd_line.GetProgram())) {
+ *exit_code = installer::INSTALL_REPAIRED; // Success.
gab 2012/08/30 20:26:28 Use the style in this file, i.e. have HandleOsUpgr
huangs 2012/08/30 20:46:31 As discussed, doing some other way.
+ } else {
+ *exit_code = installer::HANDLE_OS_UPGRADE_FAILED;
+ }
} else if (cmd_line.HasSwitch(installer::switches::kInactiveUserToast)) {
// Launch the inactive user toast experiment.
int flavor = -1;

Powered by Google App Engine
This is Rietveld 408576698