fix ubO pt.5

browser/components/nsBrowserGlue.js

@@ -922,7 +922,9 @@ BrowserGlue.prototype = {
     AutoCompletePopup.init();
     DateTimePickerHelper.init();
 
-    this._firstWindowLoaded();
+    if (typeof this._firstWindowLoaded == "function") {
+      this._firstWindowLoaded();
+    }
   },
 
   /**

browser/components/webextensions/schemas/context_menus.json

@@ -11,7 +11,8 @@
         "choices": [{
           "type": "string",
           "enum": [
-            "contextMenus"
+            "contextMenus",
+            "menus"
           ]
         }]
       }
@@ -20,7 +21,7 @@
   {
     "namespace": "contextMenus",
     "description": "Use the <code>browser.contextMenus</code> API to add items to the browser's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.",
-    "permissions": ["contextMenus"],
+    "permissions": ["contextMenus", "menus"],
     "properties": {
       "ACTION_MENU_TOP_LEVEL_LIMIT": {
         "value": 6,