Bug 1435437 - Don't append bundle_browser using an overlay;r=Gijs

- bundle_browser_region is already unused so that's just removed.
- After the previous changeset, bundle_browser is referenced only in utilityOverlay.js,
  where it's used for the context menu's "Open Link In New Container Tab" submenu.

By updating that one consumer to use Services.strings.createBundle directly we can
remove all instances of the bundle_browser node (overlay and otherwise), and chip
away at the baseMenuOverlay file.

MozReview-Commit-ID: KylUwBRNciS

--HG--
extra : rebase_source : 0ba6478a55111e77a77da40c15d74d9c6c9339c6
This commit is contained in:
Brian Grinstead 2018-02-02 16:48:02 -08:00
Родитель 9f2a58c64c
Коммит 7fba5a2648
5 изменённых файлов: 6 добавлений и 21 удалений

Просмотреть файл

@ -103,9 +103,4 @@
modifiers="accel,alt"/>
#endif
</keyset>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
<stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
</stringbundleset>
</overlay>

Просмотреть файл

@ -1,5 +1,3 @@
<stringbundleset id="stringbundleset"/>
<commandset id="mainCommandSet"/>
<commandset id="baseMenuCommandSet"/>
<commandset id="placesCommands"/>

Просмотреть файл

@ -547,15 +547,15 @@ function createUserContextMenu(event, {
event.target.firstChild.remove();
}
let bundle = document.getElementById("bundle_browser");
let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
let docfrag = document.createDocumentFragment();
// If we are excluding a userContextId, we want to add a 'no-container' item.
if (excludeUserContextId || showDefaultTab) {
let menuitem = document.createElement("menuitem");
menuitem.setAttribute("data-usercontextid", "0");
menuitem.setAttribute("label", bundle.getString("userContextNone.label"));
menuitem.setAttribute("accesskey", bundle.getString("userContextNone.accesskey"));
menuitem.setAttribute("label", bundle.GetStringFromName("userContextNone.label"));
menuitem.setAttribute("accesskey", bundle.GetStringFromName("userContextNone.accesskey"));
// We don't set an oncommand/command attribute because if we have
// to exclude a userContextId we are generating the contextMenu and
@ -577,7 +577,7 @@ function createUserContextMenu(event, {
menuitem.setAttribute("label", ContextualIdentityService.getUserContextLabel(identity.userContextId));
if (identity.accessKey && useAccessKeys) {
menuitem.setAttribute("accesskey", bundle.getString(identity.accessKey));
menuitem.setAttribute("accesskey", bundle.GetStringFromName(identity.accessKey));
}
menuitem.classList.add("menuitem-iconic");
@ -597,10 +597,10 @@ function createUserContextMenu(event, {
let menuitem = document.createElement("menuitem");
menuitem.setAttribute("label",
bundle.getString("userContext.aboutPage.label"));
bundle.GetStringFromName("userContext.aboutPage.label"));
if (useAccessKeys) {
menuitem.setAttribute("accesskey",
bundle.getString("userContext.aboutPage.accesskey"));
bundle.GetStringFromName("userContext.aboutPage.accesskey"));
}
menuitem.setAttribute("command", "Browser:OpenAboutContainers");
docfrag.appendChild(menuitem);

Просмотреть файл

@ -25,10 +25,6 @@
<script type="application/javascript" src="chrome://browser/content/browser-places.js"/>
<script type="application/javascript" src="chrome://browser/content/web-panels.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
</stringbundleset>
<broadcasterset id="mainBroadcasterSet">
<broadcaster id="isFrameImage"/>
</broadcasterset>

Просмотреть файл

@ -26,10 +26,6 @@
<script type="application/javascript" src="chrome://browser/content/browser-places.js"/>
<script type="application/javascript" src="chrome://browser/content/webext-panels.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
</stringbundleset>
<broadcasterset id="mainBroadcasterSet">
<broadcaster id="isFrameImage"/>
</broadcasterset>