From 0f4693c1eb8ab6420349a9924909cc68349c7387 Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@mozilla.com>
Date: Thu, 27 Aug 2015 10:28:17 -0700
Subject: [PATCH] Bug 1191158 - Revert bug 1191158 that promotes allocations to
 be non-experimental.

---
 browser/devtools/performance/performance.xul | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/browser/devtools/performance/performance.xul b/browser/devtools/performance/performance.xul
index 1852a7811fe7..67f38aee5ab2 100644
--- a/browser/devtools/performance/performance.xul
+++ b/browser/devtools/performance/performance.xul
@@ -32,7 +32,7 @@
 
   <popupset id="performance-options-popupset">
     <menupopup id="performance-filter-menupopup"/>
-    <menupopup id="performance-options-menupopup" position="before_end">
+    <menupopup id="performance-options-menupopup">
       <menuitem id="option-show-platform-data"
                 type="checkbox"
                 data-pref="show-platform-data"
@@ -119,26 +119,22 @@
                          class="devtools-toolbarbutton devtools-button"
                          label="&performanceUI.toolbar.waterfall;"
                          hidden="true"
-                         data-view="waterfall"
-                         tooltiptext="&performanceUI.toolbar.waterfall.tooltiptext;" />
+                         data-view="waterfall" />
           <toolbarbutton id="select-js-calltree-view"
                          class="devtools-toolbarbutton devtools-button"
                          label="&performanceUI.toolbar.js-calltree;"
                          hidden="true"
-                         data-view="js-calltree"
-                         tooltiptext="&performanceUI.toolbar.js-calltree.tooltiptext;" />
+                         data-view="js-calltree" />
           <toolbarbutton id="select-js-flamegraph-view"
                          class="devtools-toolbarbutton devtools-button"
                          label="&performanceUI.toolbar.js-flamegraph;"
                          hidden="true"
-                         data-view="js-flamegraph"
-                         tooltiptext="&performanceUI.toolbar.js-flamegraph.tooltiptext;" />
+                         data-view="js-flamegraph" />
           <toolbarbutton id="select-memory-calltree-view"
                          class="devtools-toolbarbutton devtools-button"
                          label="&performanceUI.toolbar.memory-calltree;"
                          hidden="true"
-                         data-view="memory-calltree"
-                         tooltiptext="&performanceUI.toolbar.allocations.tooltiptext;" />
+                         data-view="memory-calltree" />
           <toolbarbutton id="select-memory-flamegraph-view"
                          class="devtools-toolbarbutton devtools-button"
                          label="&performanceUI.toolbar.memory-flamegraph;"