From b5aa8e5c8e7b07018eefa16df6aac7665bbbf359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 22 Jun 2010 08:34:21 +0200
Subject: [PATCH] Bug 571567 - use <menupopup> instead of <popup>. r=enn

---
 browser/base/content/browser.xul              | 22 +++++++++----------
 browser/base/content/web-panels.xul           | 16 +++++++-------
 .../places/content/bookmarksPanel.xul         |  2 +-
 .../places/content/history-panel.xul          |  2 +-
 browser/components/places/content/places.xul  |  8 +++----
 .../places/content/placesOverlay.xul          | 10 ++++-----
 .../components/console/content/console.xul    |  4 ++--
 .../help/content/helpContextOverlay.xul       |  6 ++---
 .../prompts/content/commonDialog.xul          |  6 ++---
 .../components/viewconfig/content/config.xul  |  4 ++--
 .../viewsource/content/viewPartialSource.xul  |  4 ++--
 .../viewsource/content/viewSource.xul         |  4 ++--
 toolkit/obsolete/content/globalOverlay.xul    |  4 ++--
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index cf9985f2ddb9..e25c35265e8a 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -244,8 +244,8 @@
       </tree>
     </panel>
 
-    <popup id="toolbar-context-menu"
-           onpopupshowing="onViewToolbarsPopupShowing(event);">
+    <menupopup id="toolbar-context-menu"
+               onpopupshowing="onViewToolbarsPopupShowing(event);">
       <menuseparator/>
       <menuitem command="cmd_ToggleTabsOnTop"
                 type="checkbox"
@@ -255,15 +255,15 @@
       <menuitem command="cmd_CustomizeToolbars"
                 label="&viewCustomizeToolbar.label;"
                 accesskey="&viewCustomizeToolbar.accesskey;"/>
-    </popup>
+    </menupopup>
 
-    <popup id="blockedPopupOptions" 
-           onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
+    <menupopup id="blockedPopupOptions" 
+               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
       <menuitem observes="blockedPopupAllowSite"/>
       <menuitem observes="blockedPopupEditSettings"/>
       <menuitem observes="blockedPopupDontShowMessage"/>
       <menuseparator observes="blockedPopupsSeparator"/>
-    </popup>
+    </menupopup>
 
     <menupopup id="autohide-context"
            onpopupshowing="FullScreen.getAutohide(this.firstChild);">
@@ -276,13 +276,13 @@
                 oncommand="BrowserFullScreen();"/>
     </menupopup>
 
-    <popup id="contentAreaContextMenu"
-           onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
-           onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
+    <menupopup id="contentAreaContextMenu"
+               onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
+               onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
 #include browser-context.inc
-    </popup>
+    </menupopup>
 
-    <popup id="placesContext"/>
+    <menupopup id="placesContext"/>
 
     <panel id="notification-popup" position="after_start" noautofocus="true" hidden="true"/>
 
diff --git a/browser/base/content/web-panels.xul b/browser/base/content/web-panels.xul
index 045caf4e369b..c84aa46196fd 100644
--- a/browser/base/content/web-panels.xul
+++ b/browser/base/content/web-panels.xul
@@ -80,15 +80,15 @@
 
   <popupset id="mainPopupSet">
     <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
-    <popup id="contentAreaContextMenu"
-           onpopupshowing="if (event.target != this)
-                             return true;
-                           gContextMenu = new nsContextMenu(this, getPanelBrowser());
-                           return gContextMenu.shouldDisplay;"
-           onpopuphiding="if (event.target == this)
-                            gContextMenu = null;">
+    <menupopup id="contentAreaContextMenu"
+               onpopupshowing="if (event.target != this)
+                                 return true;
+                               gContextMenu = new nsContextMenu(this, getPanelBrowser());
+                               return gContextMenu.shouldDisplay;"
+               onpopuphiding="if (event.target == this)
+                                gContextMenu = null;">
 #include browser-context.inc
-    </popup>
+    </menupopup>
   </popupset>
 
   <commandset id="editMenuCommands"/> 
diff --git a/browser/components/places/content/bookmarksPanel.xul b/browser/components/places/content/bookmarksPanel.xul
index b24042d46996..f19e9102fd4f 100644
--- a/browser/components/places/content/bookmarksPanel.xul
+++ b/browser/components/places/content/bookmarksPanel.xul
@@ -59,7 +59,7 @@
 
   <commandset id="placesCommands"/>
   <commandset id="editMenuCommands"/>
-  <popup id="placesContext"/>
+  <menupopup id="placesContext"/>
 
   <!-- Bookmarks and history tooltip -->
   <tooltip id="bhTooltip"/>
diff --git a/browser/components/places/content/history-panel.xul b/browser/components/places/content/history-panel.xul
index 436aa869934e..e2bb42af05af 100644
--- a/browser/components/places/content/history-panel.xul
+++ b/browser/components/places/content/history-panel.xul
@@ -75,7 +75,7 @@
   </keyset>
 
   <!-- required to overlay the context menu -->
-  <popup id="placesContext" />
+  <menupopup id="placesContext"/>
 
   <!-- Bookmarks and history tooltip -->
   <tooltip id="bhTooltip"/>
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index 6e4fe72eadef..4dea64d10394 100644
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -179,10 +179,10 @@
   </keyset>
 
   <popupset id="placesPopupset">
-    <popup id="placesContext"/>
-    <popup id="placesColumnsContext"
-           onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
-           oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
+    <menupopup id="placesContext"/>
+    <menupopup id="placesColumnsContext"
+               onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
+               oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
   </popupset>
 
   <toolbox id="placesToolbox">
diff --git a/browser/components/places/content/placesOverlay.xul b/browser/components/places/content/placesOverlay.xul
index 0f32fa13d902..05d346dec0c5 100644
--- a/browser/components/places/content/placesOverlay.xul
+++ b/browser/components/places/content/placesOverlay.xul
@@ -123,10 +123,10 @@
              oncommand="goDoPlacesCommand('placesCmd_delete');"/>
   </commandset>
 
-  <popup id="placesContext"
-         onpopupshowing="this._view = PlacesUIUtils.getViewForNode(document.popupNode);
-                         return this._view.buildContextMenu(this);"
-         onpopuphiding="this._view.destroyContextMenu();">
+  <menupopup id="placesContext"
+             onpopupshowing="this._view = PlacesUIUtils.getViewForNode(document.popupNode);
+                             return this._view.buildContextMenu(this);"
+             onpopuphiding="this._view.destroyContextMenu();">
     <menuitem id="placesContext_open"
               command="placesCmd_open"
               label="&cmd.open.label;"
@@ -258,6 +258,6 @@
               accesskey="&cmd.properties.accesskey;"
               selection="bookmark|folder|query"
               forcehideselection="livemarkChild"/>
-  </popup>
+  </menupopup>
 
 </overlay>
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 9a8a78e50cad..c7d9d278db8c 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -79,7 +79,7 @@
   </keyset>
 
   <popupset id="ContextMenus">
-    <popup id="ConsoleContext">
+    <menupopup id="ConsoleContext">
       <menuitem type="radio" id="Console:sortAscend"
                 label="&sortFirst.label;" accesskey="&sortFirst.accesskey;"
                 oncommand="changeSortOrder('forward');"/>
@@ -89,7 +89,7 @@
       <menuseparator/>
       <menuitem id="menu_copy_cm" command="cmd_copy"
                 label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"/>
-    </popup>
+    </menupopup>
   </popupset>
   
   <toolbox id="console-toolbox">
diff --git a/toolkit/components/help/content/helpContextOverlay.xul b/toolkit/components/help/content/helpContextOverlay.xul
index 9f9af91e75a4..e476017c46a4 100644
--- a/toolkit/components/help/content/helpContextOverlay.xul
+++ b/toolkit/components/help/content/helpContextOverlay.xul
@@ -44,8 +44,8 @@
 
 # Help Window's right-click menu
   <popupset id="contentAreaContextSet">
-    <popup id="contentAreaContextMenu"
-           onpopupshowing="goUpdateCommand('cmd_copy')">
+    <menupopup id="contentAreaContextMenu"
+               onpopupshowing="goUpdateCommand('cmd_copy')">
       <menuitem id="context-back"
                 label="&backButton.label;"
                 accesskey="&backButton.accesskey;"
@@ -88,6 +88,6 @@
                 accesskey="&zLevel.accesskey;"
                 oncommand="toggleZLevel(this);"/>
 #endif
-    </popup>
+    </menupopup>
   </popupset>
 </overlay>
diff --git a/toolkit/components/prompts/content/commonDialog.xul b/toolkit/components/prompts/content/commonDialog.xul
index 44c1e4121dda..f81b0111e4f6 100644
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -25,8 +25,8 @@
   </commandset>
 
   <popupset id="contentAreaContextSet">
-    <popup id="contentAreaContextMenu"
-           onpopupshowing="goUpdateCommand('cmd_copy')">
+    <menupopup id="contentAreaContextMenu"
+               onpopupshowing="goUpdateCommand('cmd_copy')">
       <menuitem id="context-copy"
                 label="&copyCmd.label;"
                 accesskey="&copyCmd.accesskey;"
@@ -36,7 +36,7 @@
                 label="&selectAllCmd.label;"
                 accesskey="&selectAllCmd.accesskey;"
                 command="cmd_selectAll"/>
-    </popup>
+    </menupopup>
   </popupset>
 
   <hbox id="filler" style="min-width: 0%;">
diff --git a/toolkit/components/viewconfig/content/config.xul b/toolkit/components/viewconfig/content/config.xul
index b07c2d8d7d74..866b5c688b5d 100644
--- a/toolkit/components/viewconfig/content/config.xul
+++ b/toolkit/components/viewconfig/content/config.xul
@@ -55,7 +55,7 @@
 
 <stringbundle id="configBundle" src="chrome://global/locale/config.properties"/>
 
-<popup id="configContext" onpopupshowing="if (event.target == this) updateContextMenu();">
+<menupopup id="configContext" onpopupshowing="if (event.target == this) updateContextMenu();">
   <menuitem id="toggleSelected" default="true"
             label="&toggle.label;" accesskey="&toggle.accesskey;"
             oncommand="ModifySelected();"/>
@@ -74,7 +74,7 @@
     </menupopup>
   </menu>
   <menuitem id="resetSelected" label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
-</popup>
+</menupopup>
 
 <keyset id="configTreeKeyset" disabled="true">
   <key keycode="VK_ENTER" oncommand="ModifySelected();"/>
diff --git a/toolkit/components/viewsource/content/viewPartialSource.xul b/toolkit/components/viewsource/content/viewPartialSource.xul
index 50d2b98d807b..ce16f8ac53a8 100644
--- a/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/toolkit/components/viewsource/content/viewPartialSource.xul
@@ -111,13 +111,13 @@
     <key id="key_textZoomReset2" key="&textReset.commandkey2;" command="cmd_textZoomReset" modifiers="accel"/>
   </keyset>
 
-  <popup id="viewSourceContextMenu">
+  <menupopup id="viewSourceContextMenu">
     <menuitem id="cMenu_findAgain"/>
     <menuseparator/>
     <menuitem id="cMenu_copy"/>
     <menuseparator/>
     <menuitem id="cMenu_selectAll"/>
-  </popup>
+  </menupopup>
 
   <!-- Menu --> 
   <toolbox id="viewSource-toolbox">
diff --git a/toolkit/components/viewsource/content/viewSource.xul b/toolkit/components/viewsource/content/viewSource.xul
index e5a5982ee186..d0df8b95349b 100644
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@@ -142,7 +142,7 @@
 
   </keyset>
 
-  <popup id="viewSourceContextMenu">
+  <menupopup id="viewSourceContextMenu">
     <menuitem id="context-back"
               label="&backCmd.label;"
               accesskey="&backCmd.accesskey;"
@@ -159,7 +159,7 @@
     <menuitem id="cMenu_copy"/>
     <menuseparator/>
     <menuitem id="cMenu_selectAll"/>
-  </popup>
+  </menupopup>
 
   <!-- Menu --> 
   <toolbox id="viewSource-toolbox">
diff --git a/toolkit/obsolete/content/globalOverlay.xul b/toolkit/obsolete/content/globalOverlay.xul
index 6b37b808f3a4..5149788ccbf0 100644
--- a/toolkit/obsolete/content/globalOverlay.xul
+++ b/toolkit/obsolete/content/globalOverlay.xul
@@ -26,9 +26,9 @@
   ]]></script>
 
   <popupset id="aTooltipSet">
-    <popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" > 
+    <tooltip id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);">
       <label id="TOOLTIP-tooltipText" class="tooltip-label" flex="1"/>
-    </popup>
+    </tooltip>
   </popupset>
 
 </overlay>