Bug 1369755 part A - Add context about browser performance to the in-content UI.Remove the tap-to-activate UI on desktop, because we don't specifically say "click" on desktop anyway, and we don't want/need to customize it from PluginContent.jsm. ui-review=sbarrett r=felipe

MozReview-Commit-ID: D7rIGkldH5z

--HG--
extra : rebase_source : d7dd6bf61863fcb815184b2a7bd47f6045517885

toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd

@@ -3,6 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
+<!ENTITY pluginActivationWarning                             "This site uses a plugin that may slow &brandShortName;.">
 <!ENTITY tapToPlayPlugin                                     "Tap here to activate plugin.">
 <!ENTITY clickToActivatePlugin                               "Activate plugin.">
 <!ENTITY checkForUpdates                                     "Check for updates…">

toolkit/pluginproblem/content/pluginProblem.xml

@@ -27,6 +27,7 @@
                 <html:label>
                     <html:button class="icon" anonid="icon"/>
                     <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
+                    <html:div class="msg msgActivationWarning">&pluginActivationWarning;</html:div>
                     <html:div class="msg msgTapToPlay">&tapToPlayPlugin;</html:div>
                     <html:div class="msg msgClickToPlay" anonid="clickToPlay">&clickToActivatePlugin;</html:div>
                 </html:label>

toolkit/pluginproblem/content/pluginProblemContent.css

@@ -86,14 +86,13 @@ a .hoverBox,
 }
 
 a .msgClickToPlay,
-a .msgTapToPlay,
 :-moz-handler-clicktoplay .msgClickToPlay,
+:-moz-handler-clicktoplay .msgActivationWarning,
 :-moz-handler-vulnerable-updatable .msgVulnerabilityStatus,
 :-moz-handler-vulnerable-updatable .msgCheckForUpdates,
 :-moz-handler-vulnerable-updatable .msgClickToPlay,
 :-moz-handler-vulnerable-no-update .msgVulnerabilityStatus,
 :-moz-handler-vulnerable-no-update .msgClickToPlay,
-:-moz-handler-clicktoplay .msgTapToPlay,
 :-moz-handler-blocked .msgBlocked,
 :-moz-handler-crashed .msgCrashed {
   display: block;

toolkit/themes/shared/plugins/pluginProblem.css

@@ -32,11 +32,8 @@
   background-color: rgb(65, 65, 65);
 }
 
-:-moz-handler-clicktoplay .hoverBox:active .msgTapToPlay,
 :-moz-handler-clicktoplay .hoverBox:active .msgClickToPlay,
-:-moz-handler-vulnerable-updatable .hoverBox:active .msgTapToPlay,
 :-moz-handler-vulnerable-updatable .hoverBox:active .msgClickToPlay,
-:-moz-handler-vulnerable-no-update .hoverBox:active .msgTapToPlay,
 :-moz-handler-vulnerable-no-update .hoverBox:active .msgClickToPlay {
   color: red;
 }
@@ -93,23 +90,14 @@ a .icon,
   }
 }
 
-.msgTapToPlay,
 .msgClickToPlay {
   text-decoration: underline;
 }
 
-@media not all and (-moz-touch-enabled) {
-  :-moz-handler-clicktoplay .msgTapToPlay,
-  a .msgTapToPlay  {
+/* on desktop, don't ever show the tap-to-play UI: that is for mobile only */
+:-moz-handler-clicktoplay .msgTapToPlay,
+a .msgTapToPlay  {
   display: none;
-  }
-}
-
-@media (-moz-touch-enabled) {
-    :-moz-handler-clicktoplay .msgClickToPlay,
-    a .msgClickToPlay {
-    display: none;
-  }
 }
 
 .submitStatus div {