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

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: Abandoning the use of ON_OS_UPGRADE_SUCCESSFUL installer 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
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..7377156260a1bb26e2967aa8b35e4b61f72d790b 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)) {
+ handled = false;
grt (UTC plus 2) 2012/08/30 04:15:25 i think it's simpler to only set |handled| to fals
huangs 2012/08/30 17:13:07 Done.
+ if (cmd_line.HasSwitch(installer::switches::kChrome)) {
grt (UTC plus 2) 2012/08/30 04:15:25 --chrome won't be on the command-line in all cases
huangs 2012/08/30 17:13:07 Done.
+ if (installer::OnOsUpgrade(original_state, *installer_state,
grt (UTC plus 2) 2012/08/30 04:15:25 i think gab, you, and i need to discuss this in pe
grt (UTC plus 2) 2012/08/30 04:15:25 this needs to be: *exit_code = !installer::OnOsU
gab 2012/08/30 14:24:32 How does this not apply to Chromium? I agree it o
huangs 2012/08/30 17:13:07 Renamed to HandleOsUpgradeForBrowser(), per discus
huangs 2012/08/30 17:13:07 On failure, then exit_code == 1, which will be ret
+ cmd_line.GetProgram())) {
+ *exit_code = 0; // Successful.
+ }
+ handled = true;
grt (UTC plus 2) 2012/08/30 04:15:25 and remove this
huangs 2012/08/30 17:13:07 Done.
+ }
grt (UTC plus 2) 2012/08/30 04:15:25 and change this to: } else { handled = false; }
gab 2012/08/30 14:24:32 Hmmmm, |handled| should not be touched by the hand
grt (UTC plus 2) 2012/08/30 17:06:08 @gab's right. do what he says.
huangs 2012/08/30 17:13:07 Done.
huangs 2012/08/30 17:13:07 Ah. Replacing this with *exit_code = installer::U
} 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