Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 24 Jun 2013 08:51:07 -0400
changeset 136243 501a4ba3506a
parent 136242 d317e0e8afb7
child 136244 3da4f4ddc833
push id24869
push userbsmedberg@mozilla.com
push dateMon, 24 Jun 2013 12:52:42 +0000
treeherdermozilla-central@50332b66c7a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs880735
milestone24.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 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
browser/base/content/browser-plugins.js
browser/locales/en-US/chrome/browser/browser.properties
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/windows/browser.css
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -598,31 +598,16 @@ var gPluginHandler = {
         overlay.removeEventListener("click", gPluginHandler._overlayClickListener, true);
       let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
       if (gPluginHandler.canActivatePlugin(objLoadingContent))
         gPluginHandler._handleClickToPlayEvent(plugin);
     }
     gPluginHandler._showClickToPlayNotification(browser);
   },
 
-  // returns true if there is a plugin on this page that needs activation
-  // and isn't in the "except these" list
-  _pluginNeedsActivationExceptThese: function PH_pluginNeedsActivationExceptThese(aExceptThese) {
-    let contentWindow = gBrowser.selectedBrowser.contentWindow;
-    let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIDOMWindowUtils);
-    let pluginNeedsActivation = cwu.plugins.some(function(plugin) {
-      let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
-      return (gPluginHandler.canActivatePlugin(objLoadingContent) &&
-              aExceptThese.indexOf(plugin) < 0);
-    });
-
-    return pluginNeedsActivation;
-  },
-
   _clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) {
     if (event == "showing") {
       gPluginHandler._makeCenterActions(this);
     }
     else if (event == "dismissed") {
       // Once the popup is dismissed, clicking the icon should show the full
       // list again
       this.options.primaryPlugin = null;
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -99,24 +99,17 @@ popupWarningDontShowFromLocationbar=Don'
 popupShowPopupPrefix=Show '%S'
 
 # missing plugin installer
 installPlugin.message = Would you like to install the plugin needed to display the media on this page?
 installPlugin.button.label=Install %S
 installPlugin.button.accesskey=I
 installPlugin.ignoreButton.label=Don't ask again
 installPlugin.ignoreButton.accesskey=N
-outdatedpluginsMessage.title=Some plugins used by this page are out of date.
-outdatedpluginsMessage.updateButton.label=Update Plugins…
-outdatedpluginsMessage.updateButton.accesskey=U
-blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
-blockedpluginsMessage.infoButton.label=Details…
-blockedpluginsMessage.infoButton.accesskey=D
-blockedpluginsMessage.searchButton.label=Update Plugins…
-blockedpluginsMessage.searchButton.accesskey=U
+
 crashedpluginsMessage.title=The %S plugin has crashed.
 crashedpluginsMessage.reloadButton.label=Reload page
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Submit a crash report
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Learn More…
 
 ## Plugin doorhanger strings
@@ -142,16 +135,17 @@ pluginActivate.riskLabel=What's the risk
 pluginActivateBlocked.message=%2$S has blocked "%1$S" for your protection.
 pluginActivateBlocked.label=Blocked for your protection
 pluginActivateDisabled.message="%S" is disabled.
 pluginActivateDisabled.label=Disabled
 pluginActivateDisabled.manage=Manage plugins…
 pluginEnabled.message="%S" is enabled on %S.
 pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
 pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
+pluginInfo.unknownPlugin=Unknown
 
 # LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
 # LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
 # plugin in the current session for an short time (about an hour), auto-renewed
 # if the site keeps using the plugin.
 pluginActivateNow.label=Allow Now
 pluginActivateNow.accesskey=N
 # LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
@@ -159,33 +153,20 @@ pluginActivateNow.accesskey=N
 # plugin.
 pluginActivateAlways.label=Allow and Remember
 pluginActivateAlways.accesskey=R
 pluginBlockNow.label=Block Plugin
 pluginBlockNow.accesskey=B
 pluginContinue.label=Continue Allowing
 pluginContinue.accesskey=C
 
-activatePluginsMessage.message=Would you like to activate the plugins on this page?
-activateAllPluginsMessage.label=Activate All Plugins
-activatePluginsMessage.accesskey=A
-activatePluginsMessage.always=Always activate plugins for this site
-activatePluginsMessage.always.accesskey=c
-activatePluginsMessage.never=Never activate plugins for this site
-activatePluginsMessage.never.accesskey=N
-activateSinglePlugin=Activate
+# in-page UI
 PluginClickToActivate=Activate %S.
-# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
-# plugin that is being exploited by attackers.
-PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
-PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
-vulnerableUpdatablePluginWarning=Outdated Version!
-vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
-vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
-pluginInfo.unknownPlugin=Unknown
+PluginVulnerableUpdatable=This plugin is unsafe and should be updated.
+PluginVulnerableNoUpdate=This plugin is unsafe.
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Clear All History
 sanitizeButtonOK=Clear Now
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2209,114 +2209,21 @@ toolbar[iconsize="small"] .toolbarbutton
   background-image: radial-gradient(circle farthest-corner at center 3px, rgb(233,242,252) 3%, rgba(172,206,255,0.75) 40%, rgba(87,151,201,0.5) 80%, rgba(87,151,201,0));
 }
 
 chatbox {
   border-top-left-radius: 2.5px;
   border-top-right-radius: 2.5px;
 }
 
-.click-to-play-plugins-notification-content {
-  margin: -10px;
-}
-
-.click-to-play-plugins-notification-icon-box {
-  -moz-border-end: 1px solid hsla(0,0%,100%,.2);
-  padding-top: 16px;
-  -moz-padding-start: 16px;
-  -moz-padding-end: 6px;
-}
-
-.click-to-play-plugins-notification-separator {
-  -moz-border-start: 1px solid hsla(211,79%,6%,.1);
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.click-to-play-plugins-notification-description-box {
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  padding: 14px 10px 9px 10px;
-}
-
-.click-to-play-plugins-notification-center-box {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  background-color: hsla(211,79%,6%,.05);
-}
-
-.click-to-play-plugins-notification-button-container {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  margin: 0px;
-  padding: 2px;
-}
-
-.center-item-box {
-  padding-top: 11px;
-  -moz-padding-start: 16px;
-  -moz-padding-end: 11px;
-  margin-bottom: -2px;
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-}
-
-.center-item-box[padbottom="true"] {
-  padding-bottom: 12px;
-}
-
-.center-item-icon {
-  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
-  background-repeat: no-repeat;
-  height: 16px;
-  width: 16px;
-  margin-bottom: 4px;
-}
-
-.center-item-box[warn="true"] {
-  background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
-  background-repeat: repeat-x;
-  padding-top: 7px;
-  -moz-padding-end: 11px;
-  padding-bottom: 9px;
-  -moz-padding-start: 16px;
-}
-
-.center-item-box[padbottom="true"][warn="true"] {
-  padding-bottom: 7px;
-}
-
-.center-item-box[showseparator="true"] {
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.center-item-box[warn="false"] > .center-item-warning {
-  display: none;
-}
-
-.center-item-warning > .text-link {
-  color: #3d8cd7;
-}
-
-.center-item-warning > .text-link[href=""] {
-  display: none;
-}
-
 .center-item-warning-icon {
   background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  margin-bottom: 4px;
-}
-
-.center-item-warning-description {
-  color: #828282;
-}
-
-.center-item-button {
-  min-width: 0;
 }
 
 #main-window[privatebrowsingmode=temporary] #TabsToolbar::before {
   display: -moz-box;
   content: "";
   background: url("chrome://browser/skin/privatebrowsing-mask.png") center no-repeat;
   width: 40px;
 }
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3862,128 +3862,21 @@ panel[type="arrow"][popupid="click-to-pl
 }
 @media (min-resolution: 2dppx) {
   panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="top"],
   panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="bottom"] {
     list-style-image: url("chrome://global/skin/arrow/panelarrow-light-vertical@2x.png");
  }
 }
 
-.click-to-play-plugins-notification-content {
-  margin: -16px;
-  border-radius: 5px;
-}
-
-.click-to-play-plugins-notification-icon-box {
-  background: hsla(0,0%,100%,.4);
-  -moz-border-end: 1px solid hsla(0,0%,100%,.2);
-  padding-top: 16px;
-  -moz-padding-end: 12px;
-  -moz-padding-start: 20px;
-}
-
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
-  border-bottom-left-radius: 5px;
-  border-top-left-radius: 5px;
-}
-
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 5px;
-  border-top-right-radius: 5px;
-}
-
-.click-to-play-plugins-notification-separator {
-  -moz-border-start: 1px solid hsla(211,79%,6%,.1);
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.click-to-play-plugins-notification-description-box {
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  max-width: 28em;
-  padding: 14px 16px 9px 16px;
-}
-
-.click-to-play-plugins-notification-center-box {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  background-color: hsla(211,79%,6%,.05);
-}
-
-.click-to-play-plugins-notification-button-container {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  margin: 0px;
-  padding: 2px;
-}
-
-.center-item-box {
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  padding-top: 7px;
-  -moz-padding-end: 11px;
-  -moz-padding-start: 16px;
-  margin-bottom: -3px;
-}
-
-.center-item-box[padbottom="true"] {
-  padding-bottom: 12px;
-}
-
-.center-item-icon {
-  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
-  background-repeat: no-repeat;
-  height: 16px;
-  width: 16px;
-  margin-bottom: 4px;
-  -moz-margin-end: 6px;
-}
-
-.center-item-box[warn="true"] {
-  background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
-  background-repeat: repeat-x;
-  padding-top: 3px;
-  -moz-padding-end: 11px;
-  padding-bottom: 9px;
-  -moz-padding-start: 16px;
-}
-
-.center-item-box[padbottom="true"][warn="true"] {
-  padding-bottom: 7px;
-}
-
-.center-item-box[showseparator="true"] {
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.center-item-box[warn="false"] > .center-item-warning {
-  display: none;
-}
-
-.center-item-warning > .text-link {
-  color: #3d8cd7;
-}
-
-.center-item-warning > .text-link[href=""] {
-  display: none;
-}
-
 .center-item-warning-icon {
   background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  margin-bottom: 4px;
-}
-
-.center-item-warning-description {
-  color: #828282;
-}
-
-.center-item-button {
-  min-width: 0;
 }
 
 #main-window[privatebrowsingmode=temporary] {
   background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
   background-position: top right;
   background-repeat: no-repeat;
   background-color: -moz-mac-chrome-active;
 }
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2985,122 +2985,21 @@ toolbarbutton.bookmark-item[dragover="tr
   background-image: radial-gradient(circle farthest-corner at center 3px, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 40%, rgba(127,179,255,0.5) 80%, rgba(127,179,255,0.25));
 }
 
 chatbox {
   border-top-left-radius: 2.5px;
   border-top-right-radius: 2.5px;
 }
 
-.click-to-play-plugins-notification-content {
-  margin: -10px;
-  border-radius: 4px;
-}
-
-.click-to-play-plugins-notification-icon-box {
-  -moz-border-end: 1px solid hsla(0,0%,100%,.2);
-  padding-top: 16px;
-  -moz-padding-end: 16px;
-  -moz-padding-start: 24px;
-}
-
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;
-}
-
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
-.click-to-play-plugins-notification-separator {
-  -moz-border-start: 1px solid hsla(211,79%,6%,.1);
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.click-to-play-plugins-notification-description-box {
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  padding-top: 12px;
-  -moz-padding-end: 11px;
-  padding-bottom: 9px;
-  -moz-padding-start: 10px;
-}
-
-.click-to-play-plugins-notification-center-box {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  border-bottom: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  background-color: hsla(211,79%,6%,.05);
-}
-
-.click-to-play-plugins-notification-button-container {
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  -moz-border-start: 1px solid hsla(0,0%,100%,.2);
-  margin: 0px;
-  padding: 2px;
-}
-
-.center-item-box {
-  padding: 12px 16px 0px 16px;
-}
-
-.center-item-box[padbottom="true"] {
-  padding-bottom: 12px;
-}
-
-.center-item-icon {
-  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
-  background-repeat: no-repeat;
-  height: 16px;
-  width: 16px;
-  margin-bottom: 4px;
-}
-
-.center-item-box[warn="true"] {
-  background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
-  background-repeat: repeat-x;
-  padding: 8px 16px 6px 16px;
-}
-
-.center-item-box[padbottom="true"][warn="true"] {
-  padding-bottom: 4px;
-}
-
-.center-item-box[showseparator="true"] {
-  border-top: 1px solid hsla(211,79%,6%,.1);
-}
-
-.center-item-box[warn="false"] > .center-item-warning {
-  display: none;
-}
-
-.center-item-warning > .text-link {
-  color: #3d8cd7;
-}
-
-.center-item-warning > .text-link[href=""] {
-  display: none;
-}
-
 .center-item-warning-icon {
   background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  margin-bottom: 4px;
-}
-
-.center-item-warning-description {
-  color: #828282;
-}
-
-.center-item-button {
-  min-width: 0;
 }
 
 #main-window[privatebrowsingmode=temporary] #toolbar-menubar {
   background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
   background-position: top right;
   background-repeat: no-repeat;
 }