Bug 254225 - [Mac] Expose back/forward keyboard shortcuts in the Go menu. r=mconnor a=asa

browser/base/content/browser-menubar.inc

@@ -318,14 +318,22 @@
               <menupopup id="goPopup" onpopupshowing="updateGoMenu(this);" onpopuphiding="onGoMenuHidden();">
                 <menuitem label="&backCmd.label;"
                           accesskey="&backCmd.accesskey;"
+#ifdef XP_MACOSX
+                          key="goBackKb2"
+#else
                           key="goBackKb"
+#endif
                           oncommand="BrowserBack(event, true)"
                           onclick="checkForMiddleClick(this, event);">
                   <observes element="Browser:Back" attribute="disabled" />
                 </menuitem>
                 <menuitem label="&forwardCmd.label;" 
                           accesskey="&forwardCmd.accesskey;"
-                          key="goForwardKb" 
+#ifdef XP_MACOSX
+                          key="goForwardKb2"
+#else
+                          key="goForwardKb"
+#endif
                           oncommand="BrowserForward(event, true)"
                           onclick="checkForMiddleClick(this, event);">
                   <observes element="Browser:Forward" attribute="disabled" />

browser/base/content/browser-sets.inc

@@ -267,17 +267,12 @@
 #ifndef XP_MACOSX
     <key keycode="VK_BACK" command="cmd_handleBackspace"/>
     <key keycode="VK_BACK" command="Browser:Forward" modifiers="shift"/>
-#endif
-#ifdef XP_UNIX
-    <key key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
-    <key key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
-#endif
-#ifdef XP_MACOSX
-    <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="accel"/>
-    <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="accel"/>
-#else
     <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
     <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>
+#endif
+#ifdef XP_UNIX
+    <key id="goBackKb2" key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
+    <key id="goForwardKb2" key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
 #endif
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
     <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>