Bug 656273 - Create a toolbar for Scratchpad; r=dcamp

browser/devtools/scratchpad/scratchpad-manager.jsm

@@ -163,4 +163,4 @@ var ShutdownObserver = {
   {
     Services.obs.removeObserver(this, "quit-application-granted");
   }
-};
+};

browser/devtools/scratchpad/scratchpad.js

@@ -1399,6 +1399,7 @@ var Scratchpad = {
         telemetry.toolClosed("scratchpad");
         window.close();
       }
+
       if (aCallback) {
         aCallback();
       }
@@ -1467,6 +1468,9 @@ var Scratchpad = {
     }
   },
 
+  /**
+   * Opens the MDN documentation page for Scratchpad.
+   */
   openDocumentationPage: function SP_openDocumentationPage()
   {
     let url = this.strings.GetStringFromName("help.openDocumentationPage");
@@ -1476,7 +1480,6 @@ var Scratchpad = {
   },
 };
 
-
 /**
  * Encapsulates management of the sidebar containing the VariablesView for
  * object inspection.

browser/devtools/scratchpad/scratchpad.xul

@@ -162,7 +162,6 @@
                 command="sp-cmd-close"/>
     </menupopup>
   </menu>
-
   <menu id="sp-edit-menu" label="&editMenu.label;"
         accesskey="&editMenu.accesskey;">
     <menupopup id="sp-menu_editpopup"
@@ -182,7 +181,6 @@
       <menuitem id="se-menu-gotoLine"/>
     </menupopup>
   </menu>
-
   <menu id="sp-execute-menu" label="&executeMenu.label;"
         accesskey="&executeMenu.accesskey;">
     <menupopup id="sp-menu_executepopup">
@@ -252,6 +250,36 @@
   </menu>
 </menubar>
 
+<toolbar id="sp-toolbar"
+         class="devtools-toolbar">
+  <toolbarbutton id="sp-toolbar-open"
+                 class="devtools-toolbarbutton"
+                 label="&openFileCmd.label;"
+                 command="sp-cmd-openFile"/>
+  <toolbarbutton id="sp-toolbar-save"
+                 class="devtools-toolbarbutton"
+                 label="&saveFileCmd.label;"
+                 command="sp-cmd-save"/>
+  <toolbarbutton id="sp-toolbar-saveAs"
+                 class="devtools-toolbarbutton"
+                 label="&saveFileAsCmd.label;"
+                 command="sp-cmd-saveas"/>
+  <toolbarspacer/>
+  <toolbarbutton id="sp-toolbar-run"
+                 class="devtools-toolbarbutton"
+                 label="&run.label;"
+                 command="sp-cmd-run"/>
+  <toolbarbutton id="sp-toolbar-inspect"
+                 class="devtools-toolbarbutton"
+                 label="&inspect.label;"
+                 command="sp-cmd-inspect"/>
+  <toolbarbutton id="sp-toolbar-display"
+                 class="devtools-toolbarbutton"
+                 label="&display.label;"
+                 command="sp-cmd-display"/>
+</toolbar>
+
+
 <popupset id="scratchpad-popups">
   <menupopup id="scratchpad-text-popup"
              onpopupshowing="goUpdateSourceEditorMenuItems()">