From 05340e92d16f53b646e016918191802defa164dd Mon Sep 17 00:00:00 2001 From: Michael Ratcliffe Date: Tue, 15 Sep 2015 08:10:51 +0100 Subject: [PATCH] Bug 1203748 - Add Windows 10 to DEVTOOLS_OS_ENUMERATED_PER_USER. r=pbrosset --- toolkit/components/telemetry/Histograms.json | 2 +- toolkit/devtools/shared/system.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index d4ea3aeb320..f8052f1b354 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -7241,7 +7241,7 @@ "expires_in_version": "never", "kind": "enumerated", "n_values": 13, - "description": "OS of DevTools user (0:Windows XP, 1:Windows Vista, 2:Windows 7, 3:Windows 8, 4:Windows 8.1, 5:OSX, 6:Linux 7:reserved, 8:reserved, 9:reserved, 10:reserved, 11:reserved, 12:other)" + "description": "OS of DevTools user (0:Windows XP, 1:Windows Vista, 2:Windows 7, 3:Windows 8, 4:Windows 8.1, 5:OSX, 6:Linux 7:Windows 10, 8:reserved, 9:reserved, 10:reserved, 11:reserved, 12:other)" }, "DEVTOOLS_OS_IS_64_BITS_PER_USER": { "expires_in_version": "never", diff --git a/toolkit/devtools/shared/system.js b/toolkit/devtools/shared/system.js index 61206b29a53..f448571987b 100644 --- a/toolkit/devtools/shared/system.js +++ b/toolkit/devtools/shared/system.js @@ -282,7 +282,9 @@ function getOSCPU() { if (oscpu.includes("Linux")) { return 6; } - + if (oscpu.includes("NT 10.")) { + return 7; + } // Other OS. return 12; }