From c8d8432abafd179de45c81ab4f121720798dc904 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Wed, 28 Jan 2015 17:13:42 +0000 Subject: [PATCH] Bug 1125378 - indicate default e10s state in remote troubleshooting, r=gavin --- toolkit/content/aboutSupport.js | 4 +++- toolkit/locales/en-US/chrome/global/aboutSupport.properties | 5 +++++ toolkit/modules/Troubleshoot.jsm | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 69cfe943e2e..56f25b640c3 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -41,7 +41,9 @@ let snapshotFormatters = { if (data.vendor) version += " (" + data.vendor + ")"; $("version-box").textContent = version; - $("multiprocess-box").textContent = data.numRemoteWindows + "/" + data.numTotalWindows; + + $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessStatus", + [data.numRemoteWindows, data.numTotalWindows, data.remoteAutoStart], 3); }, #ifdef MOZ_CRASHREPORTER diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties index c0e8cac20ea..65c1e283f29 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties @@ -86,3 +86,8 @@ loadedLibVersions = Version in use hasSeccompBPF = Seccomp-BPF (System Call Filtering) canSandboxContent = Content Process Sandboxing canSandboxMedia = Media Plugin Sandboxing + +# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number +# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true' +# or 'false') +multiProcessStatus = %1$S/%2$S (default: %3$S) diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 5064413be0a..cc317df4798 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -161,6 +161,8 @@ let dataProviders = { } } + data.remoteAutoStart = Services.appinfo.browserTabsRemoteAutostart; + done(data); },