Bug 1166867 - Support -moz-os-version: windows-win10. r=jimm

This commit is contained in:
Tim Nguyen 2015-05-21 12:16:00 +02:00
parent 682368e167
commit 93dcf227cd
3 changed files with 11 additions and 7 deletions

View File

@ -61,6 +61,7 @@ const OperatingSystemVersionInfo osVersionStrings[] = {
{ LookAndFeel::eOperatingSystemVersion_WindowsVista, L"windows-vista" },
{ LookAndFeel::eOperatingSystemVersion_Windows7, L"windows-win7" },
{ LookAndFeel::eOperatingSystemVersion_Windows8, L"windows-win8" },
{ LookAndFeel::eOperatingSystemVersion_Windows10, L"windows-win10" }
};
#endif

View File

@ -430,6 +430,7 @@ public:
eOperatingSystemVersion_WindowsVista,
eOperatingSystemVersion_Windows7,
eOperatingSystemVersion_Windows8,
eOperatingSystemVersion_Windows10,
eOperatingSystemVersion_Unknown
};

View File

@ -28,7 +28,9 @@ nsLookAndFeel::GetOperatingSystemVersion()
return version;
}
if (IsWin8OrLater()) {
if (IsWin10OrLater()) {
version = eOperatingSystemVersion_Windows10;
} else if (IsWin8OrLater()) {
version = eOperatingSystemVersion_Windows8;
} else if (IsWin7OrLater()) {
version = eOperatingSystemVersion_Windows7;