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

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

Issue 498573003: Add relaunch into ASH and desktop support for Chrome on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed menu strings to Chrome OS mode Created 6 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/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 b71a87b9bc619d559db652f4ca80a32ac8c72550..8a683b4b2cb432b52401381810ae7a3f140e7f3b 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -136,11 +136,15 @@ bool RelaunchChromeHelper(const 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 &&
+ relaunch_mode != RELAUNCH_MODE_METRO &&
+ relaunch_mode != RELAUNCH_MODE_DESKTOP)
return base::LaunchProcess(chrome_exe_command_line,
base::LaunchOptions(), NULL);
// On Windows 8 we always use the delegate_execute for re-launching chrome.
+ // On Windows 7 we use delegate_execute for re-launching chrome into Windows
+ // ASH.
//
// Pass this Chrome's Start Menu shortcut path to the relauncher so it can re-
// activate chrome via ShellExecute which will wait until we exit. Since

Powered by Google App Engine
This is Rietveld 408576698