Bug 888510 - In-content theming fixup for the new plugin click-to-activate. Remove the "lightweight" transparent click-to-play theming and make the normal styling plain grey. Switch from a CSS gradient to an image gradient because of performance issues. Highlight the "check for updates" button for outdated plugins. Icons by shorlander and lco, ui-review=lco r=jaws

--HG--
rename : toolkit/themes/osx/mozapps/plugins/contentPluginCrashed.png => toolkit/themes/shared/plugins/contentPluginCrashed.png
rename : toolkit/themes/osx/mozapps/plugins/contentPluginDownload.png => toolkit/themes/shared/plugins/contentPluginDownload.png
rename : toolkit/themes/osx/mozapps/plugins/contentPluginMissing.png => toolkit/themes/shared/plugins/contentPluginMissing.png
rename : toolkit/themes/windows/mozapps/plugins/pluginProblem.css => toolkit/themes/shared/plugins/pluginProblem.css

browser/base/content/browser-plugins.js

@@ -269,7 +269,7 @@ var gPluginHandler = {
           let iconStatus = doc.getAnonymousElementByAttribute(plugin, "class", "icon");
           iconStatus.setAttribute("installable", "true");
 
-          let installLink = doc.getAnonymousElementByAttribute(plugin, "class", "installPluginLink");
+          let installLink = doc.getAnonymousElementByAttribute(plugin, "anonid", "installPluginLink");
           this.addLinkClickCallback(installLink, "installSinglePlugin", plugin);
         }
         break;
@@ -280,7 +280,7 @@ var gPluginHandler = {
         break;
 
       case "PluginVulnerableUpdatable":
-        let updateLink = doc.getAnonymousElementByAttribute(plugin, "class", "checkForUpdatesLink");
+        let updateLink = doc.getAnonymousElementByAttribute(plugin, "anonid", "checkForUpdatesLink");
         this.addLinkClickCallback(updateLink, "openPluginUpdatePage");
         /* FALLTHRU */
 
@@ -306,7 +306,7 @@ var gPluginHandler = {
         break;
 
       case "PluginDisabled":
-        let manageLink = doc.getAnonymousElementByAttribute(plugin, "class", "managePluginsLink");
+        let manageLink = doc.getAnonymousElementByAttribute(plugin, "anonid", "managePluginsLink");
         this.addLinkClickCallback(manageLink, "managePlugins");
         shouldShowNotification = true;
         break;

browser/base/content/test/browser_pluginnotification.js

@@ -134,7 +134,7 @@ function test3() {
   ok(pluginNode, "Test 3, Found plugin in page");
   var objLoadingContent = pluginNode.QueryInterface(Ci.nsIObjectLoadingContent);
   is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_DISABLED, "Test 3, plugin fallback type should be PLUGIN_DISABLED");
-  var manageLink = gTestBrowser.contentDocument.getAnonymousElementByAttribute(pluginNode, "class", "managePluginsLink");
+  var manageLink = gTestBrowser.contentDocument.getAnonymousElementByAttribute(pluginNode, "anonid", "managePluginsLink");
   ok(manageLink, "Test 3, found 'manage' link in plugin-problem binding");
 
   EventUtils.synthesizeMouseAtCenter(manageLink, {}, gTestBrowser.contentWindow);
@@ -344,7 +344,7 @@ function test18a() {
   ok(!objLoadingContent.activated, "Test 18a, Plugin should not be activated");
   var overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
   ok(overlay.style.visibility != "hidden", "Test 18a, Plugin overlay should exist, not be hidden");
-  var updateLink = doc.getAnonymousElementByAttribute(plugin, "class", "checkForUpdatesLink");
+  var updateLink = doc.getAnonymousElementByAttribute(plugin, "anonid", "checkForUpdatesLink");
   ok(updateLink.style.visibility != "hidden", "Test 18a, Plugin should have an update link");
 
   var tabOpenListener = new TabOpenListener(Services.urlFormatter.formatURLPref("plugins.update.url"), false, false);
@@ -387,7 +387,7 @@ function test18c() {
   ok(!objLoadingContent.activated, "Test 18c, Plugin should not be activated");
   var overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
   ok(overlay.style.visibility != "hidden", "Test 18c, Plugin overlay should exist, not be hidden");
-  var updateLink = doc.getAnonymousElementByAttribute(plugin, "class", "checkForUpdatesLink");
+  var updateLink = doc.getAnonymousElementByAttribute(plugin, "anonid", "checkForUpdatesLink");
   ok(updateLink.style.display != "block", "Test 18c, Plugin should not have an update link");
 
   // check that click "Always allow" works with blocklisted plugins

toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd

@@ -39,7 +39,7 @@
 <!ENTITY checkForUpdates                                     "Check for updates…">
 <!ENTITY disabledPlugin                                      "This plugin is disabled.">
 <!ENTITY blockedPlugin.label                                 "This plugin has been blocked for your protection.">
-
+<!ENTITY hidePluginBtn.label                                 "Hide plugin">
 <!ENTITY installPlugin                                       "Install plugin…">
 <!ENTITY managePlugins                                       "Manage plugins…">
 

toolkit/mozapps/plugins/content/pluginProblem.xml

@@ -22,19 +22,17 @@
     </resources>
 
     <content>
-        <xul:vbox class="mainBox" flex="1" chromedir="&locale.dir;">
-            <html:button class="closeIcon" anonid="closeIcon"/>
-            <xul:vbox class="hoverBox" flex="1">
-                <xul:spacer flex="1"/>
-                <html:div>
+        <html:div class="mainBox" chromedir="&locale.dir;">
+            <html:div class="hoverBox">
+                <html:label>
                     <html:button class="icon"/>
-                </html:div>
+                    <html:div class="msg msgTapToPlay">&tapToPlayPlugin;</html:div>
+                    <html:div class="msg msgClickToPlay">&clickToActivatePlugin;</html:div>
+                    <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
+                </html:label>
+
                 <html:div class="msg msgUnsupported">&missingPlugin;</html:div>
                 <html:div class="msg msgUnsupportedPlatform">&unsupportedPlatform.pre;<html:a class="unsupportedLearnMoreLink" href="" target="_blank">&unsupportedPlatform.learnMore;</html:a>&unsupportedPlatform.post;</html:div>
-                <html:div class="msg msgTapToPlay">&tapToPlayPlugin;</html:div>
-                <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
-                <html:div class="msg msgCheckForUpdates"><html:a class="checkForUpdatesLink" href="">&checkForUpdates;</html:a></html:div>
-                <html:div class="msg msgClickToPlay">&clickToActivatePlugin;</html:div>
                 <html:div class="msg msgDisabled">&disabledPlugin;</html:div>
                 <html:div class="msg msgBlocked">&blockedPlugin.label;</html:div>
                 <html:div class="msg msgCrashed">
@@ -44,9 +42,11 @@
                 </html:div>
 
                 <html:div class="installStatus">
-                    <html:div class="msg msgInstallPlugin"><html:a class="installPluginLink" href="">&installPlugin;</html:a></html:div>
+                    <html:div class="msg msgInstallPlugin">
+		        <html:a class="action-link" anonid="installPluginLink" href="">&installPlugin;</html:a>
+		    </html:div>
                 </html:div>
-                <html:div class="msg msgManagePlugins"><html:a class="managePluginsLink" href="">&managePlugins;</html:a></html:div>
+                <html:div class="msg msgManagePlugins"><html:a class="action-link" anonid="managePluginsLink" href="">&managePlugins;</html:a></html:div>
                 <html:div class="submitStatus">
                     <html:div class="msg msgPleaseSubmit">
                         <html:textarea class="submitComment"
@@ -66,9 +66,10 @@
                     <html:div class="msg msgSubmitFailed">&report.failed;</html:div>
                     <html:div class="msg msgNoCrashReport">&report.unavailable;</html:div>
                 </html:div>
-                <xul:spacer flex="1"/>
-            </xul:vbox>
-        </xul:vbox>
+                <html:div class="msg msgCheckForUpdates"><html:a class="action-link" anonid="checkForUpdatesLink" href="">&checkForUpdates;</html:a></html:div>
+            </html:div>
+            <html:button class="closeIcon" anonid="closeIcon" title="&hidePluginBtn.label;"/>
+        </html:div>
         <html:div class="previewPluginContent"><!-- iframe and its src will be set at runtime --></html:div>
         <html:div style="display:none;"><children/></html:div>
     </content>

toolkit/themes/linux/mozapps/jar.mn

@@ -32,7 +32,6 @@ toolkit.jar:
 + skin/classic/mozapps/plugins/notifyPluginCrashed.png     (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/plugins/notifyPluginGeneric.png     (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
-+ skin/classic/mozapps/plugins/pluginDisabled.png          (plugins/pluginDisabled.png)
 + skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
 + skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)

toolkit/themes/osx/mozapps/jar.mn

@@ -55,19 +55,18 @@ toolkit.jar:
   skin/classic/mozapps/passwordmgr/key-16.png                     (passwordmgr/key-16.png)
   skin/classic/mozapps/passwordmgr/key-16@2x.png                  (passwordmgr/key-16@2x.png)
   skin/classic/mozapps/passwordmgr/key-64.png                     (passwordmgr/key-64.png)
-  skin/classic/mozapps/plugins/contentPluginBlocked.png           (plugins/contentPluginBlocked.png)
-  skin/classic/mozapps/plugins/contentPluginClose.png             (plugins/contentPluginClose.png)
-  skin/classic/mozapps/plugins/contentPluginCrashed.png           (plugins/contentPluginCrashed.png)
-  skin/classic/mozapps/plugins/contentPluginDisabled.png          (plugins/contentPluginDisabled.png)
-  skin/classic/mozapps/plugins/contentPluginDownload.png          (plugins/contentPluginDownload.png)
-  skin/classic/mozapps/plugins/contentPluginMissing.png           (plugins/contentPluginMissing.png)
-  skin/classic/mozapps/plugins/contentPluginClickToPlay.png       (plugins/contentPluginClickToPlay.png)
-  skin/classic/mozapps/plugins/contentPluginClickToPlayPlain.png  (plugins/contentPluginClickToPlayPlain.png)
+  skin/classic/mozapps/plugins/pluginProblem.css                  (../../shared/plugins/pluginProblem.css)
+  skin/classic/mozapps/plugins/contentPluginActivate.png          (../../shared/plugins/contentPluginActivate.png)
+  skin/classic/mozapps/plugins/contentPluginBlocked.png           (../../shared/plugins/contentPluginBlocked.png)
+  skin/classic/mozapps/plugins/contentPluginClose.png             (../../shared/plugins/contentPluginClose.png)
+  skin/classic/mozapps/plugins/contentPluginCrashed.png           (../../shared/plugins/contentPluginCrashed.png)
+  skin/classic/mozapps/plugins/contentPluginDisabled.png          (../../shared/plugins/contentPluginDisabled.png)
+  skin/classic/mozapps/plugins/contentPluginDownload.png          (../../shared/plugins/contentPluginDownload.png)
+  skin/classic/mozapps/plugins/contentPluginMissing.png           (../../shared/plugins/contentPluginMissing.png)
+  skin/classic/mozapps/plugins/contentPluginStripe.png            (../../shared/plugins/contentPluginStripe.png)
   skin/classic/mozapps/plugins/notifyPluginCrashed.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
-  skin/classic/mozapps/plugins/pluginProblem.css                  (plugins/pluginProblem.css)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
-  skin/classic/mozapps/plugins/pluginDisabled.png                 (plugins/pluginDisabled.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginBlocked-64.png               (plugins/pluginBlocked-64.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png               (plugins/pluginGeneric-16.png)

toolkit/themes/osx/mozapps/plugins/pluginProblem.css

@@ -1,221 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-/* These styles affect only the bound element, not other page content. */
-
-.mainBox {
-  font: message-box;
-  font-size: 12px;
-  text-align: center;
-  background-image: -moz-repeating-linear-gradient(-45deg,
-                                                   rgba(65, 65, 65, 0.8),
-                                                   rgba(65, 65, 65, 0.8) 20px,
-                                                   rgba(69, 69, 69, 0.8) 20px,
-                                                   rgba(69, 69, 69, 0.8) 40px);
-  color: white;
-  text-shadow: rgba(0,0,0,0.8) 0 0 3.5px;
-  border-radius: 12px;
-  /* recessed effect with dark inner shadow and lightened bottom */
-  box-shadow: inset 0 1px 3.5px rgba(0,0,0,0.8),
-              0 1px 0 rgba(255,255,255,0.2);
-  -moz-user-select: none;
-  position: relative;
-}
-
-.hoverBox {
-  padding: 5px;
-}
-
-html|a {
-  color: white;
-}
-
-.icon {
-  display: inline-block;
-  width: 48px;
-  height: 48px;
-  background-position: center;
-  background-repeat: no-repeat;
-  border: none;
-  background-color: transparent;
-}
-:-moz-type-unsupported .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginMissing.png);
-}
-:-moz-type-unsupported .icon[installable] {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginDownload.png);
-}
-:-moz-handler-vulnerable-updatable .icon,
-:-moz-handler-vulnerable-no-update .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginClickToPlay.png);
-}
-
-:-moz-handler-clicktoplay .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginClickToPlayPlain.png);
-  background-position: 0 0;
-}
-:-moz-handler-clicktoplay .hoverBox:hover .icon {
- background-position: -48px 0;
-}
-:-moz-handler-clicktoplay .hoverBox:hover:active .icon {
- background-position: -96px 0;
-}
-
-:-moz-handler-disabled .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginDisabled.png);
-}
-:-moz-handler-blocked .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png);
-}
-:-moz-handler-crashed .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginCrashed.png);
-}
-
-.throbber {
-  padding-left: 16px; /* width of the background image */
-  background: url(chrome://global/skin/icons/loading_16.png) no-repeat;
-  margin-left: 5px;
-}
-
-.msg {
-  cursor: default;
-  width: 100%;
-}
-
-:-moz-handler-clicktoplay .mainBox,
-:-moz-handler-clicktoplay .icon,
-:-moz-handler-clicktoplay .msgClickToPlay,
-:-moz-handler-vulnerable-updatable .msgClickToPlay,
-:-moz-handler-vulnerable-no-update .msgClickToPlay {
-  cursor: pointer;
-}
-
-:-moz-handler-clicktoplay .msgTapToPlay {
-  display: none;
-}
-
-.submitStatus div {
-  min-height: 19px; /* height of biggest line (with throbber) */
-}
-
-.submitComment {
-  width: 340px;
-  height: 70px;
-  padding: 5px;
-  border: none;
-  border-radius: 5px;
-  resize: none;
-  font-family: inherit;
-  font-size: inherit;
-}
-
-.submitURLOptInBox {
-  text-align: start;
-}
-
-.submitURLOptIn {
-  margin-left: -1px;
-}
-
-.mainBox[chromedir="rtl"] .submitURLOptIn {
-  margin-left: 0;
-  margin-right: -1px;
-}
-
-.submitButtonBox {
-  margin-top: 7px;
-}
-
-.submitButton {
-  float: right;
-}
-
-.mainBox[chromedir="rtl"] .submitButton {
-  float: left;
-}
-
-.helpIcon {
-  display: inline-block;
-  min-width: 16px;
-  min-height: 16px;
-  background: url(chrome://mozapps/skin/plugins/pluginHelp-16.png) no-repeat;
-  cursor: pointer;
-  float: left;
-}
-
-.mainBox[chromedir="rtl"] .helpIcon {
-  float: right;
-}
-
-.closeIcon {
-  display: block;
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  top: 4px;
-  right: 4px;
-  border: none;
-  background-color: transparent;
-  background-image: url("chrome://global/skin/icons/close.png");
-  background-repeat: no-repeat;
-}
-
-.mainBox[chromedir="rtl"] .closeIcon {
-  right: auto;
-  left: 4px;
-}
-
-.closeIcon:hover {
-  background-position: -16px 0;
-}
-
-.closeIcon:hover:active {
-  background-position: -32px 0;
-}
-
-@media (min-resolution: 2dppx) {
-  .closeIcon {
-    background-image: url("chrome://global/skin/icons/close@2x.png");
-    background-size: auto 16px;
-  }
-}
-
-:-moz-handler-clicktoplay .mainBox {
-  background-image: none;
-  background-color: hsla(0,0%,100%,.2);
-  border: 1px dashed hsla(0,0%,50%,0.5);
-  border-radius: 2.5px;
-  color: hsl(0,0%,50%);
-  text-shadow: none;
-  box-shadow: none;
-  transition: background-color 150ms ease;
-}
-
-:-moz-handler-clicktoplay .mainBox:hover {
-  background-color: hsla(0,0%,90%,.7);
-}
-:-moz-handler-clicktoplay .mainBox:hover:active {
-  background-color: hsla(0,0%,90%,.8);
-}
-
-:-moz-handler-clicktoplay .mainBox,
-:-moz-handler-clicktoplay html|a {
-  color: hsl(0,0%,35%);
-}
-
-:-moz-handler-clicktoplay .hoverBox:hover,
-:-moz-handler-clicktoplay .hoverBox:hover html|a {
-  color: hsl(0,0%,20%);
-}
-
-:-moz-handler-clicktoplay .hoverBox:hover:active,
-:-moz-handler-clicktoplay .hoverBox:hover:active html|a {
-  color: hsl(0,0%,10%);
-}
-
-:-moz-handler-clicktoplay .closeIcon {
-  background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png");
-}

toolkit/themes/shared/plugins/pluginProblem.css

@@ -10,23 +10,34 @@
   font: message-box;
   font-size: 12px;
   text-align: center;
-  background-image: -moz-repeating-linear-gradient(-45deg,
-                                                   rgba(65, 65, 65, 0.8),
-                                                   rgba(65, 65, 65, 0.8) 20px,
-                                                   rgba(69, 69, 69, 0.8) 20px,
-                                                   rgba(69, 69, 69, 0.8) 40px);
+  display: table;
+  width: 100%;
+  height: 100%;
+  background-color: rgb(72,72,72);
   color: white;
-  text-shadow: rgba(0,0,0,0.8) 0 0 3.5px;
-  border-radius: 12px;
-  /* recessed effect with dark inner shadow and lightened bottom */
-  box-shadow: inset 0 1px 3.5px rgba(0,0,0,0.8),
-              0 1px 0 rgba(255,255,255,0.2);
   -moz-user-select: none;
   position: relative;
 }
 
 .hoverBox {
+  display: table-cell;
+  -moz-box-sizing: border-box;
   padding: 5px;
+  vertical-align: middle;
+  width: 100%;
+  height: 100%;
+}
+:-moz-handler-vulnerable-updatable .hoverBox:active,
+:-moz-handler-vulnerable-no-update .hoverBox:active,
+:-moz-handler-clicktoplay .hoverBox:active {
+  background-color: rgb(65, 65, 65);
+}
+
+:-moz-handler-vulnerable-updatable .hoverBox,
+:-moz-handler-vulnerable-no-update .hoverBox,
+:-moz-handler-blocked .hoverBox,
+:-moz-handler-crashed .hoverBox {
+  background-image: url(chrome://mozapps/skin/plugins/contentPluginStripe.png);
 }
 
 html|a {
@@ -34,14 +45,16 @@ html|a {
 }
 
 .icon {
-  display: inline-block;
   width: 48px;
   height: 48px;
   background-position: center;
   background-repeat: no-repeat;
   border: none;
   background-color: transparent;
+  -moz-user-focus: ignore;
+  margin-bottom: 6px;
 }
+
 :-moz-type-unsupported .icon,
 :-moz-type-unsupported-platform .icon {
   background-image: url(chrome://mozapps/skin/plugins/contentPluginMissing.png);
@@ -51,26 +64,19 @@ html|a {
 }
 :-moz-handler-vulnerable-updatable .icon,
 :-moz-handler-vulnerable-no-update .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginClickToPlay.png);
-}
-
-:-moz-handler-clicktoplay .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginClickToPlayPlain.png);
-  background-position: 0 0;
-}
-:-moz-handler-clicktoplay .hoverBox:hover .icon {
- background-position: -48px 0;
-}
-:-moz-handler-clicktoplay .hoverBox:hover:active .icon {
- background-position: -96px 0;
-}
-
-:-moz-handler-disabled .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginDisabled.png);
+  background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png);
+  -moz-user-focus: normal;
 }
 :-moz-handler-blocked .icon {
   background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png);
 }
+:-moz-handler-clicktoplay .icon {
+  background-image: url(chrome://mozapps/skin/plugins/contentPluginActivate.png);
+  -moz-user-focus: normal;
+}
+:-moz-handler-disabled .icon {
+  background-image: url(chrome://mozapps/skin/plugins/contentPluginDisabled.png);
+}
 :-moz-handler-crashed .icon {
   background-image: url(chrome://mozapps/skin/plugins/contentPluginCrashed.png);
 }
@@ -81,19 +87,6 @@ html|a {
   margin-left: 5px;
 }
 
-.msg {
-  cursor: default;
-  width: 100%;
-}
-
-:-moz-handler-clicktoplay .mainBox,
-:-moz-handler-clicktoplay .icon,
-:-moz-handler-clicktoplay .msgClickToPlay,
-:-moz-handler-vulnerable-updatable .msgClickToPlay,
-:-moz-handler-vulnerable-no-update .msgClickToPlay {
-  cursor: pointer;
-}
-
 @media not all and (-moz-touch-enabled) {
   :-moz-handler-clicktoplay .msgTapToPlay {
     display: none;
@@ -168,7 +161,7 @@ html|a {
   right: 4px;
   border: none;
   background-color: transparent;
-  background-image: url("chrome://global/skin/icons/close.png");
+  background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png");
   background-repeat: no-repeat;
 }
 
@@ -185,39 +178,21 @@ html|a {
   background-position: -32px 0;
 }
 
-:-moz-handler-clicktoplay .mainBox {
-  background-image: none;
-  background-color: hsla(0,0%,100%,.2);
-  border: 1px dashed hsla(0,0%,50%,0.5);
-  border-radius: 2.5px;
-  color: hsl(0,0%,50%);
-  text-shadow: none;
-  box-shadow: none;
-  transition: background-color 150ms ease;
+.action-link {
+  display: inline-block;
+  border-radius: 10px;
+  background-color: rgb(35, 35, 35);
+  padding: 2px 8px;
+  margin-top: 7px;
+  text-decoration: none;
+}
+.action-link:active {
+  background-color: rgb(20, 20, 20);
 }
 
-:-moz-handler-clicktoplay .mainBox:hover {
-  background-color: hsla(0,0%,90%,.7);
+:-moz-handler-vulnerable-updatable .action-link {
+  background-color: #a81b0c;
 }
-:-moz-handler-clicktoplay .mainBox:hover:active {
-  background-color: hsla(0,0%,90%,.8);
-}
-
-:-moz-handler-clicktoplay .mainBox,
-:-moz-handler-clicktoplay html|a {
-  color: hsl(0,0%,35%);
-}
-
-:-moz-handler-clicktoplay .hoverBox:hover,
-:-moz-handler-clicktoplay .hoverBox:hover html|a {
-  color: hsl(0,0%,20%);
-}
-
-:-moz-handler-clicktoplay .hoverBox:hover:active,
-:-moz-handler-clicktoplay .hoverBox:hover:active html|a {
-  color: hsl(0,0%,10%);
-}
-
-:-moz-handler-clicktoplay .closeIcon {
-  background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png");
+:-moz-handler-vulnerable-updatable .action-link:active {
+  background-color: #801409;
 }

toolkit/themes/windows/mozapps/jar.mn

@@ -59,19 +59,18 @@ toolkit.jar:
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
 #endif
-        skin/classic/mozapps/plugins/contentPluginBlocked.png      (plugins/contentPluginBlocked.png)
-        skin/classic/mozapps/plugins/contentPluginClose.png        (plugins/contentPluginClose.png)
-        skin/classic/mozapps/plugins/contentPluginCrashed.png      (plugins/contentPluginCrashed.png)
-        skin/classic/mozapps/plugins/contentPluginDisabled.png     (plugins/contentPluginDisabled.png)
-        skin/classic/mozapps/plugins/contentPluginDownload.png     (plugins/contentPluginDownload.png)
-        skin/classic/mozapps/plugins/contentPluginMissing.png      (plugins/contentPluginMissing.png)
-        skin/classic/mozapps/plugins/contentPluginClickToPlay.png  (plugins/contentPluginClickToPlay.png)
-        skin/classic/mozapps/plugins/contentPluginClickToPlayPlain.png (plugins/contentPluginClickToPlayPlain.png)
+        skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
+        skin/classic/mozapps/plugins/contentPluginActivate.png     (../../shared/plugins/contentPluginActivate.png)
+        skin/classic/mozapps/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
+        skin/classic/mozapps/plugins/contentPluginClose.png        (../../shared/plugins/contentPluginClose.png)
+        skin/classic/mozapps/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
+        skin/classic/mozapps/plugins/contentPluginDisabled.png     (../../shared/plugins/contentPluginDisabled.png)
+        skin/classic/mozapps/plugins/contentPluginDownload.png     (../../shared/plugins/contentPluginDownload.png)
+        skin/classic/mozapps/plugins/contentPluginMissing.png      (../../shared/plugins/contentPluginMissing.png)
+        skin/classic/mozapps/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
         skin/classic/mozapps/plugins/notifyPluginCrashed.png       (plugins/pluginGeneric-16.png)
         skin/classic/mozapps/plugins/notifyPluginGeneric.png       (plugins/pluginGeneric-16.png)
-        skin/classic/mozapps/plugins/pluginProblem.css             (plugins/pluginProblem.css)
         skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
-        skin/classic/mozapps/plugins/pluginDisabled.png            (plugins/pluginDisabled.png)
         skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
         skin/classic/mozapps/plugins/pluginBlocked-64.png          (plugins/pluginBlocked-64.png)
         skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
@@ -140,19 +139,18 @@ toolkit.jar:
 #ifdef MOZ_PLACES
         skin/classic/aero/mozapps/places/defaultFavicon.png                (places/defaultFavicon.png)
 #endif
-        skin/classic/aero/mozapps/plugins/contentPluginBlocked.png         (plugins/contentPluginBlocked.png)
-        skin/classic/aero/mozapps/plugins/contentPluginClose.png           (plugins/contentPluginClose.png)
-        skin/classic/aero/mozapps/plugins/contentPluginCrashed.png         (plugins/contentPluginCrashed.png)
-        skin/classic/aero/mozapps/plugins/contentPluginDisabled.png        (plugins/contentPluginDisabled.png)
-        skin/classic/aero/mozapps/plugins/contentPluginDownload.png        (plugins/contentPluginDownload.png)
-        skin/classic/aero/mozapps/plugins/contentPluginMissing.png         (plugins/contentPluginMissing.png)
-        skin/classic/aero/mozapps/plugins/contentPluginClickToPlay.png     (plugins/contentPluginClickToPlay.png)
-        skin/classic/aero/mozapps/plugins/contentPluginClickToPlayPlain.png (plugins/contentPluginClickToPlayPlain.png)
+        skin/classic/aero/mozapps/plugins/pluginProblem.css                (../../shared/plugins/pluginProblem.css)
+        skin/classic/aero/mozapps/plugins/contentPluginActivate.png        (../../shared/plugins/contentPluginActivate.png)
+        skin/classic/aero/mozapps/plugins/contentPluginBlocked.png         (../../shared/plugins/contentPluginBlocked.png)
+        skin/classic/aero/mozapps/plugins/contentPluginClose.png           (../../shared/plugins/contentPluginClose.png)
+        skin/classic/aero/mozapps/plugins/contentPluginCrashed.png         (../../shared/plugins/contentPluginCrashed.png)
+        skin/classic/aero/mozapps/plugins/contentPluginDisabled.png        (../../shared/plugins/contentPluginDisabled.png)
+        skin/classic/aero/mozapps/plugins/contentPluginDownload.png        (../../shared/plugins/contentPluginDownload.png)
+        skin/classic/aero/mozapps/plugins/contentPluginMissing.png         (../../shared/plugins/contentPluginMissing.png)
+        skin/classic/aero/mozapps/plugins/contentPluginStripe.png          (../../shared/plugins/contentPluginStripe.png)
         skin/classic/aero/mozapps/plugins/notifyPluginCrashed.png          (plugins/pluginGeneric-16-aero.png)
         skin/classic/aero/mozapps/plugins/notifyPluginGeneric.png          (plugins/pluginGeneric-16-aero.png)
-        skin/classic/aero/mozapps/plugins/pluginProblem.css                (plugins/pluginProblem.css)
         skin/classic/aero/mozapps/plugins/pluginGeneric.png                (plugins/pluginGeneric-aero.png)
-        skin/classic/aero/mozapps/plugins/pluginDisabled.png               (plugins/pluginDisabled-aero.png)
         skin/classic/aero/mozapps/plugins/pluginBlocked.png                (plugins/pluginBlocked-aero.png)
         skin/classic/aero/mozapps/plugins/pluginBlocked-64.png             (plugins/pluginBlocked-64.png)
         skin/classic/aero/mozapps/plugins/pluginGeneric-16.png             (plugins/pluginGeneric-16-aero.png)