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

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; renamed OnOsUpgrade() to HandleOsUpgradeForBrowser(). 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..d92e9cc2a1092c6c3dd95429e82c326231aeabba 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1170,6 +1170,20 @@ 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) {
+ if (installer::HandleOsUpgradeForBrowser(*installer_state,
gab 2012/08/30 17:55:19 Instead of using a double if with the same else bl
huangs 2012/08/30 20:14:22 Done.
+ *chrome_install,
+ cmd_line.GetProgram())) {
+ *exit_code = 0; // Success.
+ } else {
+ *exit_code = installer::UNKNOWN_STATUS;
grt (UTC plus 2) 2012/08/30 19:10:18 aaah. now i see why you wanted to add a new Insta
huangs 2012/08/30 20:14:22 Discussed with gab. Now adding installer::HANDLE_
+ }
+ } else {
+ *exit_code = installer::UNKNOWN_STATUS;
+ }
} 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