Bug 1312903 - Land the missing bits in browser-sets.inc; r?stas
authorZibi Braniecki <gandalf@mozilla.com>
Tue, 25 Oct 2016 16:58:47 -0700
changeset 429442 8e23fb23036b1d49ab9b39c5d79fbf12d4336a8b
parent 429419 2ffe206d6af194997784bc7fa4abc3ac38dcc5cd
child 432351 a5ae27a88d40db8cdd7689403bb822c1c91246a4
child 432352 03c8f612cf5a53eb8a0625ba178580e9aeab7935
push id33581
push userzbraniecki@mozilla.com
push dateTue, 25 Oct 2016 23:59:13 +0000
reviewersstas
bugs1312903
milestone52.0a1
Bug 1312903 - Land the missing bits in browser-sets.inc; r?stas MozReview-Commit-ID: 5r1pzRp8m4k
browser/base/content/browser-sets.inc
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -16,16 +16,17 @@
   </stringbundleset>
 
   <commandset id="mainCommandSet">
     <command id="cmd_newNavigator" oncommand="OpenBrowserWindow()" reserved="true"/>
     <command id="cmd_handleBackspace" oncommand="BrowserHandleBackspace();" />
     <command id="cmd_handleShiftBackspace" oncommand="BrowserHandleShiftBackspace();" />
 
     <command id="cmd_newNavigatorTab" oncommand="BrowserOpenTab(event);" reserved="true"/>
+    <command id="cmd_newNavigatorTabNoEvent" oncommand="BrowserOpenTab();" reserved="true"/>
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
     <command id="Browser:SavePage" oncommand="saveBrowser(gBrowser.selectedBrowser);"/>
 
     <command id="Browser:SendLink"
              oncommand="MailIntegration.sendLinkForBrowser(gBrowser.selectedBrowser);"/>
 
     <command id="cmd_pageSetup" oncommand="PrintUtils.showPageSetup();"/>
     <command id="cmd_print" oncommand="PrintUtils.printWindow(window.gBrowser.selectedBrowser.outerWindowID, window.gBrowser.selectedBrowser);"/>
@@ -113,17 +114,17 @@
   <commandset id="placesCommands">
     <command id="Browser:ShowAllBookmarks"
              oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"/>
     <command id="Browser:ShowAllHistory"
              oncommand="PlacesCommandHook.showPlacesOrganizer('History');"/>
   </commandset>
 
   <broadcasterset id="mainBroadcasterSet">
-    <broadcaster id="Social:PageShareOrMark" disabled="true"/>
+    <broadcaster id="Social:PageShareable" disabled="true"/>
     <broadcaster id="viewBookmarksSidebar" autoCheck="false"
                  data-l10n-id="view-bookmarks-broadcaster"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
                  oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
 
     <!-- for both places and non-places, the sidebar lives at
          chrome://browser/content/history/history-panel.xul so there are no
          problems when switching between versions -->
@@ -185,17 +186,17 @@
                  key="key_viewSource"
                  command="View:PageSource">
       <observes element="canViewSource" attribute="disabled"/>
     </broadcaster>
   </broadcasterset>
 
   <keyset id="mainKeyset">
     <key id="key_newNavigator" data-l10n-id="new-navigator-command" command="cmd_newNavigator" modifiers="accel"/>
-    <key id="key_newNavigatorTab" data-l10n-id="tab-command" modifiers="accel" command="cmd_newNavigatorTab"/>
+    <key id="key_newNavigatorTab" data-l10n-id="tab-command" modifiers="accel" command="cmd_newNavigatorTabNoEvent"/>
     <key id="focusURLBar" key="&openCmd.commandkey;" command="Browser:OpenLocation" modifiers="accel"/>
 #ifndef XP_MACOSX
     <key id="focusURLBar2" key="&urlbar.accesskey;" command="Browser:OpenLocation" modifiers="alt"/>
 #endif
 
 #
 # Search Command Key Logic works like this:
 #
@@ -296,18 +297,16 @@
 #endif
     <key id="viewBookmarksSidebarKb" data-l10n-id="view-bookmarks-command" command="viewBookmarksSidebar" modifiers="accel"/>
 #ifdef XP_WIN
 # Cmd+I is conventially mapped to Info on MacOS X, thus it should not be
 # overridden for other purposes there.
     <key id="viewBookmarksSidebarWinKb" data-l10n-id="view-bookmarks-command-win" command="viewBookmarksSidebar" modifiers="accel"/>
 #endif
 
-    <!--<key id="markPage" key="&markPageCmd.commandkey;" command="Social:TogglePageMark" modifiers="accel,shift"/>-->
-
     <key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
 
 #ifdef XP_MACOSX
     <key id="key_stop_mac" modifiers="accel" key="&stopCmd.macCommandKey;" command="Browser:Stop"/>
 #endif
 
     <key id="key_gotoHistory"
          data-l10n-id="view-history-command"