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

Unified Diff: chrome/browser/first_run/upgrade_util_win.cc

Issue 1419223006: win: Don't use delegate_execute to relaunch on Win10+ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/upgrade_util_win.cc
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index e5933c78dd33ba63dcc631bb6e4b343a50eda164..5845b7ee7f5d3452e7d35c85d30f3b460a11b197 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -161,7 +161,8 @@ bool RelaunchChromeHelper(const base::CommandLine& command_line,
chrome_exe_command_line.SetProgram(
chrome_exe.DirName().Append(installer::kChromeExe));
- if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
+ if (base::win::GetVersion() != base::win::VERSION_WIN8 &&
+ base::win::GetVersion() != base::win::VERSION_WIN8_1 &&
gab 2015/10/29 21:06:05 I tend to prefer version ranges to strict comparis
scottmg 2015/10/29 21:30:36 Done.
relaunch_mode != RELAUNCH_MODE_METRO &&
relaunch_mode != RELAUNCH_MODE_DESKTOP) {
gab 2015/10/29 21:06:05 Does the |relaunch_mode| really matter on non-Win8
scottmg 2015/10/29 21:30:36 I ... don't know. It seems like it shouldn't, I gu
return base::LaunchProcess(chrome_exe_command_line,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698