Bug 1035164 - fix nullcheck in CustomizableWidgets, remove warning for items without shortcut in subviews, r=jaws

--HG--
extra : rebase_source : 0b58d1d43a877f8776ac99fe20dda9c4495c4643

browser/components/customizableui/src/CustomizableUI.jsm

@@ -1275,7 +1275,6 @@ let CustomizableUIInternal = {
         shortcut = ShortcutUtils.findShortcut(document.getElementById(commandId));
     }
     if (!shortcut) {
-      ERROR("Could not find a keyboard shortcut for '" + aShortcutNode.outerHTML + "'.");
       return;
     }
 

browser/components/customizableui/src/CustomizableWidgets.jsm

@@ -52,7 +52,7 @@ function setAttributes(aNode, aAttrs) {
         let additionalArgs = [];
         if (aAttrs.shortcutId) {
           let shortcut = doc.getElementById(aAttrs.shortcutId);
-          if (doc) {
+          if (shortcut) {
             additionalArgs.push(ShortcutUtils.prettifyShortcut(shortcut));
           }
         }