summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-07-08 21:46:44 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-07-08 21:46:44 +0200
commitf7f7224dedd63809fbf5532b7ac843cea22d9499 (patch)
tree85f998c9661d5809b56109f483177d338f63a9ce
parent20e3587ef5a97f190da7a4e674e988d7189c795c (diff)
downloadUXP-f7f7224dedd63809fbf5532b7ac843cea22d9499.tar
UXP-f7f7224dedd63809fbf5532b7ac843cea22d9499.tar.gz
UXP-f7f7224dedd63809fbf5532b7ac843cea22d9499.tar.lz
UXP-f7f7224dedd63809fbf5532b7ac843cea22d9499.tar.xz
UXP-f7f7224dedd63809fbf5532b7ac843cea22d9499.zip
Remove e10s info from about:support
tag #953
-rw-r--r--toolkit/content/aboutSupport.js22
-rw-r--r--toolkit/content/aboutSupport.xhtml9
-rw-r--r--toolkit/locales/en-US/chrome/global/aboutSupport.dtd2
-rw-r--r--toolkit/locales/en-US/chrome/global/aboutSupport.properties17
-rw-r--r--toolkit/modules/Troubleshoot.jsm12
-rw-r--r--toolkit/modules/tests/browser/browser_Troubleshoot.js7
6 files changed, 0 insertions, 69 deletions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 8908a0f80..06470f966 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -53,28 +53,6 @@ var snapshotFormatters = {
if (data.updateChannel)
$("updatechannel-box").textContent = data.updateChannel;
- let statusText = stringBundle().GetStringFromName("multiProcessStatus.unknown");
-
- // Whitelist of known values with string descriptions:
- switch (data.autoStartStatus) {
- case 0:
- case 1:
- case 2:
- case 4:
- case 6:
- case 7:
- case 8:
- statusText = stringBundle().GetStringFromName("multiProcessStatus." + data.autoStartStatus);
- break;
-
- case 10:
- statusText = (Services.appinfo.OS == "Darwin" ? "OS X 10.6 - 10.8" : "Windows XP");
- break;
- }
-
- $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessWindows",
- [data.numRemoteWindows, data.numTotalWindows, statusText], 3);
-
$("safemode-box").textContent = data.safeMode;
},
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index 5e6319182..fff86dff6 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -236,15 +236,6 @@
<tr>
<th class="column">
- &aboutSupport.appBasicsMultiProcessSupport;
- </th>
-
- <td id="multiprocess-box">
- </td>
- </tr>
-
- <tr>
- <th class="column">
&aboutSupport.appBasicsSafeMode;
</th>
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
index a2477fb2e..34db4e4c4 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
@@ -64,8 +64,6 @@ Windows/Mac use the term "Folder" instead of "Directory" -->
<!ENTITY aboutSupport.appBasicsProfiles "Profiles">
-<!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
-
<!ENTITY aboutSupport.appBasicsSafeMode "Safe Mode">
<!ENTITY aboutSupport.showDir.label "Open Directory">
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 564292e3d..be9ce5f33 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -99,23 +99,6 @@ gpuProcessKillButton = Terminate GPU Process
minLibVersions = Expected minimum version
loadedLibVersions = Version in use
-# 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 be replaced with one of the status strings below,
-# which contains a description of the multi-process preference and status.
-# Note: multiProcessStatus.3 doesn't exist because status=3 was deprecated.
-multiProcessWindows = %1$S/%2$S (%3$S)
-multiProcessStatus.0 = Enabled by user
-multiProcessStatus.1 = Enabled by default
-multiProcessStatus.2 = Disabled
-multiProcessStatus.4 = Disabled by accessibility tools
-multiProcessStatus.5 = Disabled by lack of graphics hardware acceleration on Mac OS X
-multiProcessStatus.6 = Disabled by unsupported text input
-multiProcessStatus.7 = Disabled by add-ons
-multiProcessStatus.8 = Disabled forcibly
-# No longer in use (bug 1296353) but we might bring this back.
-multiProcessStatus.9 = Disabled by graphics hardware acceleration on Windows XP
-multiProcessStatus.unknown = Unknown status
-
asyncPanZoom = Asynchronous Pan/Zoom
apzNone = none
wheelEnabled = wheel input enabled
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 8d84eec8c..6ee6cb54e 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -220,18 +220,6 @@ var dataProviders = {
}
}
- data.remoteAutoStart = Services.appinfo.browserTabsRemoteAutostart;
-
- try {
- let e10sStatus = Cc["@mozilla.org/supports-PRUint64;1"]
- .createInstance(Ci.nsISupportsPRUint64);
- let appinfo = Services.appinfo.QueryInterface(Ci.nsIObserver);
- appinfo.observe(e10sStatus, "getE10SBlocked", "");
- data.autoStartStatus = e10sStatus.data;
- } catch (e) {
- data.autoStartStatus = -1;
- }
-
done(data);
},
diff --git a/toolkit/modules/tests/browser/browser_Troubleshoot.js b/toolkit/modules/tests/browser/browser_Troubleshoot.js
index 4124be1fb..ebc4de1f9 100644
--- a/toolkit/modules/tests/browser/browser_Troubleshoot.js
+++ b/toolkit/modules/tests/browser/browser_Troubleshoot.js
@@ -126,13 +126,6 @@ const SNAPSHOT_SCHEMA = {
supportURL: {
type: "string",
},
- remoteAutoStart: {
- type: "boolean",
- required: true,
- },
- autoStartStatus: {
- type: "number",
- },
numTotalWindows: {
type: "number",
},