Bug 1482648 - Part 2 - Remove unneeded indirection in devtools broadcasters. r=bgrins
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Mon, 06 Aug 2018 15:45:17 +0100
changeset 487913 29f7da1bf5f766e074e3c5ae5b3c1a2fd35570fe
parent 487912 4c42ea4583b250aa78c491f30716a99d0629ebde
child 487914 981a904be10351695c8282ab0cc7677715c4e607
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1482648
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1482648 - Part 2 - Remove unneeded indirection in devtools broadcasters. r=bgrins Differential Revision: https://phabricator.services.mozilla.com/D3149
browser/base/content/browser-menubar.inc
browser/base/content/browser-sets.inc
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -516,23 +516,26 @@
                   <menuitem id="menu_pageSource"
                             label="&pageSourceCmd.label;"
                             key="key_viewSource"
                             command="View:PageSource"
                             accesskey="&pageSourceCmd.accesskey;">
                     <observes element="canViewSource" attribute="disabled"/>
                   </menuitem>
                   <menuitem id="menu_devtools_recordExecution"
-                            observes="devtoolsMenuBroadcaster_RecordExecution"
+                            label="&devtoolsRecordExecution.label;"
+                            command="Tools:RecordExecution"
                             hidden="true"/>
                   <menuitem id="menu_devtools_saveRecording"
-                            observes="devtoolsMenuBroadcaster_SaveRecording"
+                            label="&devtoolsSaveRecording.label;"
+                            command="Tools:SaveRecording"
                             hidden="true"/>
                   <menuitem id="menu_devtools_replayExecution"
-                            observes="devtoolsMenuBroadcaster_ReplayExecution"
+                            label="&devtoolsReplayExecution.label;"
+                            command="Tools:ReplayExecution"
                             hidden="true"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
 #ifndef XP_WIN
                         key="key_viewInfo"
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -121,26 +121,16 @@
   </commandset>
 
 #include ../../components/places/content/placesCommands.inc.xul
 
   <broadcasterset id="mainBroadcasterSet">
     <broadcaster id="isImage"/>
     <broadcaster id="canViewSource"/>
     <broadcaster id="isFrameImage"/>
-
-    <broadcaster id="devtoolsMenuBroadcaster_RecordExecution"
-                 label="&devtoolsRecordExecution.label;"
-                 command="Tools:RecordExecution"/>
-    <broadcaster id="devtoolsMenuBroadcaster_SaveRecording"
-                 label="&devtoolsSaveRecording.label;"
-                 command="Tools:SaveRecording"/>
-    <broadcaster id="devtoolsMenuBroadcaster_ReplayExecution"
-                 label="&devtoolsReplayExecution.label;"
-                 command="Tools:ReplayExecution"/>
   </broadcasterset>
 
   <keyset id="mainKeyset">
     <key id="key_newNavigator"
          key="&newNavigatorCmd.key;"
          command="cmd_newNavigator"
          modifiers="accel" reserved="true"/>
     <key id="key_newNavigatorTab" key="&tabCmd.commandkey;" modifiers="accel"