Bug 1369755 part B - Adjust the wording of the infobar to more closely match the in-content UI, and the doorhanger to more closely match other permissions and be more personal. ui-review=sbarrett r=felipe
authorBenjamin Smedberg <benjamin@smedbergs.us>
Thu, 08 Jun 2017 15:48:49 -0400
changeset 413735 4b6b2e9e5492d8e2606f4daa145f1f16ef6bbfb4
parent 413734 6c35cc91b1bb156e43c59ed028b5edef290763da
child 413736 da58840d7f3d0e38299caf95a6299b670172a30b
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1369755
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1369755 part B - Adjust the wording of the infobar to more closely match the in-content UI, and the doorhanger to more closely match other permissions and be more personal. ui-review=sbarrett r=felipe MozReview-Commit-ID: ltNXwFA0hg
browser/base/content/browser-plugins.js
browser/base/content/urlbarBindings.xml
browser/locales/en-US/chrome/browser/browser.properties
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -385,18 +385,18 @@ var gPluginHandler = {
 
       if (actions.length == 1) {
         let pluginInfo = actions[0];
         let pluginName = pluginInfo.pluginName;
 
         switch (pluginInfo.fallbackType) {
           case Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY:
             message = gNavigatorBundle.getFormattedString(
-              "pluginActivateNew.message",
-              [pluginName, origin]);
+              "pluginActivationWarning.message",
+              [brand]);
             break;
           case Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE:
             message = gNavigatorBundle.getFormattedString(
               "pluginActivateOutdated.message",
               [pluginName, origin, brand]);
             break;
           case Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_NO_UPDATE:
             message = gNavigatorBundle.getFormattedString(
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -2760,17 +2760,17 @@ file, You can obtain one at http://mozil
             };
             button2 = {
               label: "pluginActivateAlways.label",
               accesskey: "pluginActivateAlways.accesskey",
               action: "_singleActivateAlways"
             };
             switch (action.blocklistState) {
             case Ci.nsIBlocklistService.STATE_NOT_BLOCKED:
-              label = "pluginActivateNew.message";
+              label = "pluginActivate2.message";
               linkLabel = "pluginActivate.learnMore";
               button2.default = true;
               break;
 
             case Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE:
               label = "pluginActivateOutdated.message";
               linkLabel = "pluginActivate.updateLabel";
               button1.default = true;
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -267,21 +267,26 @@ crashedpluginsMessage.learnMore=Learn More…
 # whether he rather wanted to visit the host.  %S is the recognized host.
 keywordURIFixup.message=Did you mean to go to %S?
 keywordURIFixup.goTo=Yes, take me to %S
 keywordURIFixup.goTo.accesskey=Y
 keywordURIFixup.dismiss=No thanks
 keywordURIFixup.dismiss.accesskey=N
 
 ## Plugin doorhanger strings
-# LOCALIZATION NOTE (pluginActivateNew.message): Used for newly-installed
-# plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
-# is the site domain.
-pluginActivateNew.message=Allow %2$S to run “%1$S”?
+# LOCALIZATION NOTE (pluginActivate2.message):
+# Used for normal plugin activation if we don't know of a specific security issue.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivate2.message=Would you like to allow %2$S to run %1$S? Plugins may slow %3$S.
 pluginActivateMultiple.message=Allow %S to run plugins?
+
+# LOCALIZATION NOTE (pluginActivationWarning.message): this should use the
+# same string as "pluginActivationWarning" in pluginproblem.dtd
+pluginActivationWarning.message=This site uses a plugin that may slow %S.
+
 pluginActivate.learnMore=Learn More…
 # LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
 # These strings are used when an unsafe plugin has an update available.
 # %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
 pluginActivateOutdated.message=%3$S has prevented the outdated plugin “%1$S” from running on %2$S.
 pluginActivateOutdated.label=Outdated plugin
 pluginActivate.updateLabel=Update now…
 # LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):