Checking in the UI for the popups prefs panel.

browser/app/profile/all.js

@@ -299,6 +299,10 @@ pref("javascript.enabled",                  true);
 pref("javascript.options.strict",           false);
 pref("javascript.options.showInConsole",    false);
 
+// popups.policy 1=allow,2=reject
+pref("privacy.popups.policy",               2);
+pref("privacy.popups.usecustom",            false);
+
 // advanced prefs
 pref("advanced.always_load_images",         true);
 pref("security.enable_java",                true);

browser/app/profile/firebird.js

@@ -299,6 +299,10 @@ pref("javascript.enabled",                  true);
 pref("javascript.options.strict",           false);
 pref("javascript.options.showInConsole",    false);
 
+// popups.policy 1=allow,2=reject
+pref("privacy.popups.policy",               2);
+pref("privacy.popups.usecustom",            false);
+
 // advanced prefs
 pref("advanced.always_load_images",         true);
 pref("security.enable_java",                true);

browser/components/prefwindow/content/pref-popups.xul

@@ -0,0 +1,105 @@
+<?xml version="1.0"?> 
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is mozilla.org code.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE page [
+<!ENTITY % prefPopupsDTD SYSTEM "chrome://browser/locale/pref/pref-popups.dtd" >
+%prefPopupsDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      id="popupsPanel"
+      onload="init()"
+      headertitle="&title;">
+          
+<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+
+<script type="application/x-javascript">
+<![CDATA[
+  var _elementIDs = ["popupPolicy"];
+  var domCbox = null;
+  var policyButton;
+  var manageButton;
+
+  function init() {
+    parent.initPanel('chrome://browser/content/pref/pref-popups.xul');
+    policyButton = document.getElementById("popupPolicy");
+    manageButton = document.getElementById("popupView");
+    setButtons(true);
+  }
+  function setButtons(all) {
+    manageButton.disabled = policyButton.value == 1;
+  }
+  function selectPolicy() {
+    if (!domCbox) {
+      // any selection clears the competing DOM pref
+      domCbox = document.getElementById("popupDomShadow");
+      _elementIDs.push("popupDomShadow");
+      domCbox.checked = false;
+    }
+    setButtons(true);
+  }
+]]>
+</script>
+
+<groupbox id="popupsArea">
+  <caption label="&popupBlocking.label;"/>
+
+  <description>&popupDetails;</description>
+
+  <radiogroup id="popupPolicy" prefstring="privacy.popups.policy">
+    <radio value="1" label="&popupAllow.label;"
+            accesskey="&popupAllow.accesskey;"
+            oncommand="selectPolicy()"/>
+    <radio value="2" label="&popupReject.label;"
+            accesskey="&popupReject.accesskey;"
+            oncommand="selectPolicy()"/>
+  </radiogroup>
+
+  <checkbox id="popupDomShadow" hidden="true"
+            prefstring="dom.disable_open_during_load"/>
+
+  <hbox pack="end">
+    <button id="popupView" label="&popupView.label;"
+            accesskey="&popupView.accesskey;" oncommand="viewPopups();"/>
+  </hbox>
+
+</groupbox>
+
+</page>

browser/components/prefwindow/content/preftree.xul

@@ -83,6 +83,12 @@
         <treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
       </treerow>
       <treechildren id="advancedChildren">
+        <treeitem>
+          <treerow>
+            <treecell url="chrome://browser/content/pref/pref-popups.xul" label="&popups.label;"/>
+          </treerow>
+        </treeitem>
+
         <treeitem>
           <treerow>
             <treecell url="chrome://browser/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/> 

browser/components/prefwindow/jar.mn

@@ -25,6 +25,7 @@ browser.jar:
     content/browser/pref/pref-scripts.xul                  (content/pref-scripts.xul)
     content/browser/pref/pref-scripts.js                   (content/pref-scripts.js)
     content/browser/pref/pref-privacy.xul                  (content/pref-privacy.xul)
+    content/browser/pref/pref-popups.xul                   (content/pref-popups.xul)
     content/browser/pref/pref-smart_browsing.xul           (content/pref-smart_browsing.xul)
     content/browser/pref/pref-smart_browsing.js            (content/pref-smart_browsing.js)
     content/browser/pref/pref-smart_browsing-ac.xul        (content/pref-smart_browsing-ac.xul)
@@ -56,6 +57,7 @@ en-US.jar:
     locale/en-US/browser/pref/pref-connection.dtd          (locale/pref-connection.dtd)    
     locale/en-US/browser/pref/pref-scripts.dtd             (locale/pref-scripts.dtd)
     locale/en-US/browser/pref/pref-privacy.dtd             (locale/pref-privacy.dtd)
+    locale/en-US/browser/pref/pref-popups.dtd              (locale/pref-popups.dtd)
     locale/en-US/browser/pref/pref-smart_browsing.dtd      (locale/pref-smart_browsing.dtd)
     locale/en-US/browser/pref/pref-smartupdate.dtd         (locale/pref-smartupdate.dtd)
     locale/en-US/browser/pref/prefutilities.properties     (locale/prefutilities.properties)

browser/components/prefwindow/locale/pref-popups.dtd

@@ -0,0 +1,13 @@
+<!ENTITY title                          "Pop-ups">
+
+<!ENTITY popupBlocking.label            "Pop-up Window Policy">
+
+<!ENTITY popupDetails                   "When websites attempt to open new windows without being asked">
+
+<!ENTITY popupAllow.label               "Allow pop-up windows">
+<!ENTITY popupAllow.accesskey           "a">
+<!ENTITY popupReject.label              "Reject pop-up windows">
+<!ENTITY popupReject.accesskey          "r">
+
+<!ENTITY popupView.label                "Manage Popup Permissions">
+<!ENTITY popupView.accesskey            "m">

browser/components/prefwindow/locale/preftree.dtd

@@ -9,5 +9,6 @@
 <!ENTITY privacy.label "Privacy">
 <!ENTITY advance.label "Advanced">
 <!ENTITY connection.label "Connection">
-<!ENTITY scriptsAndWindows.label "Scripts &amp; Windows">
+<!ENTITY popups.label "Popup Windows">
+<!ENTITY scriptsAndWindows.label "Javascript Settings">
 <!ENTITY tabs.label "Tabbed Browsing">