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

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: Renaming kRegAutoRunOnOSUpgrade to kRegAutoRunOnOSUpgradeField; deleting bad debug message. 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
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..472cb2a0a5371638c53799b0f8b7893d7851c08b 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1170,6 +1170,15 @@ 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 = InstallUtil::GetInstallReturnCode(installer::INSTALL_REPAIRED);
} else if (cmd_line.HasSwitch(installer::switches::kInactiveUserToast)) {
// Launch the inactive user toast experiment.
int flavor = -1;
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698