chrome/test/mini_installer/variable_expander.py - Issue 891813003: Add support for correct Windows 10 version enumeration.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/mini_installer/variable_expander.py

Issue 891813003: Add support for correct Windows 10 version enumeration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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/test/mini_installer/variable_expander.py

diff --git a/chrome/test/mini_installer/variable_expander.py b/chrome/test/mini_installer/variable_expander.py

index a240bfae784266f5f7b5e31ccdca8ed36e62fdf0..e9658256c15bffad12673bc6bd93cfc0432b0f48 100644

--- a/chrome/test/mini_installer/variable_expander.py

+++ b/chrome/test/mini_installer/variable_expander.py

@@ -76,7 +76,7 @@ class VariableExpander:

* $USER_SPECIFIC_REGISTRY_SUFFIX: the output from the function

_GetUserSpecificRegistrySuffix().

* $WINDOWS_VERSION: a 2-tuple representing the current Windows version.

- * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1]: a 2-tuple

+ * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1/WIN10]: a 2-tuple

representing the version of the corresponding OS.

Args:

@@ -129,6 +129,7 @@ class VariableExpander:

'VERSION_WIN7': '(6, 1)',

'VERSION_WIN8': '(6, 2)',

'VERSION_WIN8_1': '(6, 3)',

+ 'VERSION_WIN10': '(10, 0)',

}

def Expand(self, str):

« base/win/windows_version.h ('K') | « base/win/windows_version.cc ('k') | chrome_elf/thunk_getter.cc » ('j') | no next file with comments »