backout 38c9642dfab0 for test failures
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Wed, 06 Mar 2013 16:47:34 +0000
changeset 123964 fe1bfaab3957fed559c422df1823b9353df0176a
parent 123963 f6be3e974c65ca794a1503122a99a869d8ae4065
child 123965 d7e2839de3f44e065cdad3e459ded4c505bc4478
push id24160
push usermleibovic@mozilla.com
push dateWed, 06 Mar 2013 16:47:51 +0000
treeherdermozilla-inbound@42845185ca07 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone22.0a1
backs out38c9642dfab018863b0dbca783eda124cf44884a
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
backout 38c9642dfab0 for test failures
mobile/android/chrome/content/browser.js
mobile/android/locales/en-US/chrome/browser.properties
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5617,42 +5617,40 @@ var PopupBlockerObserver = {
     if (!browser.pageReport.reported) {
       if (Services.prefs.getBoolPref("privacy.popups.showBrowserMessage")) {
         let brandShortName = Strings.brand.GetStringFromName("brandShortName");
         let message;
         let popupCount = browser.pageReport.length;
 
         let strings = Strings.browser;
         if (popupCount > 1)
-          message = strings.formatStringFromName("popup.warningMultiple", [brandShortName, popupCount], 2);
+          message = strings.formatStringFromName("popupWarningMultiple", [brandShortName, popupCount], 2);
         else
-          message = strings.formatStringFromName("popup.warning", [brandShortName], 1);
+          message = strings.formatStringFromName("popupWarning", [brandShortName], 1);
 
         let buttons = [
           {
-            label: strings.GetStringFromName("popup.show"),
-            callback: function(aChecked) {
+            label: strings.GetStringFromName("popupButtonAllowOnce"),
+            callback: function() { PopupBlockerObserver.showPopupsForSite(); }
+          },
+          {
+            label: strings.GetStringFromName("popupButtonAlwaysAllow2"),
+            callback: function() {
               // Set permission before opening popup windows
-              if (aChecked)
-                PopupBlockerObserver.allowPopupsForSite(true);
-
+              PopupBlockerObserver.allowPopupsForSite(true);
               PopupBlockerObserver.showPopupsForSite();
             }
           },
           {
-            label: strings.GetStringFromName("popup.dontShow"),
-            callback: function(aChecked) {
-              if (aChecked)
-                PopupBlockerObserver.allowPopupsForSite(false);
-            }
+            label: strings.GetStringFromName("popupButtonNeverWarn2"),
+            callback: function() { PopupBlockerObserver.allowPopupsForSite(false); }
           }
         ];
 
-        let options = { checkbox: Strings.browser.GetStringFromName("popup.dontAskAgain") };
-        NativeWindow.doorhanger.show(message, "popup-blocked", buttons, null, options);
+        NativeWindow.doorhanger.show(message, "popup-blocked", buttons);
       }
       // Record the fact that we've reported this blocked popup, so we don't
       // show it again.
       browser.pageReport.reported = true;
     }
   },
 
   allowPopupsForSite: function allowPopupsForSite(aAllow) {
@@ -6408,18 +6406,18 @@ var PermissionsHelper = {
     },
     "geolocation": {
       label: "geolocation.shareLocation",
       allowed: "geolocation.allow",
       denied: "geolocation.dontAllow"
     },
     "popup": {
       label: "blockPopups.label",
-      allowed: "popup.show",
-      denied: "popup.dontShow"
+      allowed: "popupButtonAlwaysAllow2",
+      denied: "popupButtonNeverWarn2"
     },
     "indexedDB": {
       label: "offlineApps.storeOfflineData",
       allowed: "offlineApps.allow",
       denied: "offlineApps.dontAllow2"
     },
     "offline-app": {
       label: "offlineApps.storeOfflineData",
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -43,21 +43,21 @@ addonErrorBlocklisted=#1 could not be in
 
 # Notifications
 notificationRestart.normal=Restart to complete changes.
 notificationRestart.update=Add-ons updated. Restart to complete changes.
 notificationRestart.blocked=Unsafe add-ons installed. Restart to disable.
 notificationRestart.button=Restart
 
 # Popup Blocker
-popup.warning=%S prevented this site from opening a pop-up window. Would you like to show it?
-popup.warningMultiple=%S prevented this site from opening %S pop-up windows. Would you like to show them?
-popup.dontAskAgain=Don't ask again for this site
-popup.show=Show
-popup.dontShow=Don't show
+popupWarning=%S prevented this site from opening a pop-up window.
+popupWarningMultiple=%S prevented this site from opening %S pop-up windows.
+popupButtonAllowOnce=Show
+popupButtonAlwaysAllow2=Always Show
+popupButtonNeverWarn2=Never Show
 
 # SafeBrowsing
 safeBrowsingDoorhanger=This site has been identified as containing malware or a phishing attempt. Be careful.
 
 # LOCALIZATION NOTE (blockPopups.label): Label that will be used in
 # site settings dialog.
 blockPopups.label=Block Popups