Bug 1368943 - Disable content process count UI and switch description for non-e10s users, r=jaws
authorTimothy Guan-tin Chien <timdream@gmail.com>
Fri, 09 Jun 2017 11:44:16 +0800
changeset 6483 78bd2d5755a5b4c425cb6ebaad65d6327a69c559
parent 6482 4097c48b34c2e13d98a376a1ea8f9369e95418b2
child 6484 f07b1df5830e5d4dc44a56deeaaabc2f6c244b78
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersjaws
bugs1368943
Bug 1368943 - Disable content process count UI and switch description for non-e10s users, r=jaws MozReview-Commit-ID: 7UNKrz8VMzI X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 65e8eacd6f7ce1f765542b6512c786a61523fb28
browser/chrome/browser/preferences-old/advanced.dtd
browser/chrome/browser/preferences/advanced.dtd
--- a/browser/chrome/browser/preferences-old/advanced.dtd
+++ b/browser/chrome/browser/preferences-old/advanced.dtd
@@ -132,10 +132,14 @@
 <!ENTITY useRecommendedPerformanceSettings.accesskey
                                          "U">
 <!ENTITY performanceSettingsLearnMore.label
                                          "Learn more">
 <!ENTITY limitContentProcessOption.label "Content process limit">
 <!ENTITY limitContentProcessOption.description
                                          "Additional content processes can improve performance when using multiple tabs, but will also use more memory.">
 <!ENTITY limitContentProcessOption.accesskey   "L">
+<!ENTITY limitContentProcessOption.disabledDescription
+                                         "Modifying the number of content processes is only possible with multiprocess &brandShortName;.">
+<!ENTITY limitContentProcessOption.disabledDescriptionLink
+                                         "Learn how to check if multiprocess is enabled">
 <!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "r">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -145,10 +145,14 @@
 <!ENTITY useRecommendedPerformanceSettings2.accesskey
                                          "U">
 <!ENTITY performanceSettingsLearnMore.label
                                          "Learn more">
 <!ENTITY limitContentProcessOption.label "Content process limit">
 <!ENTITY limitContentProcessOption.description
                                          "Additional content processes can improve performance when using multiple tabs, but will also use more memory.">
 <!ENTITY limitContentProcessOption.accesskey   "L">
+<!ENTITY limitContentProcessOption.disabledDescription
+                                         "Modifying the number of content processes is only possible with multiprocess &brandShortName;.">
+<!ENTITY limitContentProcessOption.disabledDescriptionLink
+                                         "Learn how to check if multiprocess is enabled">
 <!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "r">