Backed out changeset 1c7a1d0fda0e (bug 1317138) for browser-chrome fa…

…ilures on browser_duplicateIDs.js. CLOSED TREE
dothq · Aug 13, 2019 · dc6efa0 · dc6efa0
1 parent b1fd28e
commit dc6efa0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
@@ -729,11 +729,7 @@
               </hbox>
               <arrowscrollbox orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" class="tabbrowser-arrowscrollbox" scrolledtostart="true" scrolledtoend="true">
                 <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
-                <toolbarbutton id="tabs-newtab-button"
-                               class="tabs-newtab-button toolbarbutton-1"
-                               command="cmd_newNavigatorTab"
-                               onclick="checkForMiddleClick(this, event);"
-                               tooltip="dynamic-shortcut-tooltip"/>
+                <toolbarbutton class="tabs-newtab-button toolbarbutton-1" command="cmd_newNavigatorTab" onclick="checkForMiddleClick(this, event);"/>
                 <spacer class="closing-tabs-spacer" style="width: 0;"/>
               </arrowscrollbox>
               <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>

diff --git a/browser/base/content/tabbrowser-tabs.js b/browser/base/content/tabbrowser-tabs.js
@@ -67,6 +67,11 @@
       var tab = this.allTabs[0];
       tab.label = this.emptyTabTitle;
 
+      this.newTabButton.setAttribute(
+        "tooltiptext",
+        GetDynamicShortcutTooltipText("tabs-newtab-button")
+      );
+
       window.addEventListener("resize", this);
 
       this.boundObserve = (...args) => this.observe(...args);
@@ -1083,15 +1088,6 @@
 
               parent.setAttribute("type", "menu");
             }
-
-            // Update tooltip text and evict from tooltip cache
-            if (containersEnabled) {
-              nodeToTooltipMap[parent.id] = "newTabContainer.tooltip";
-            } else {
-              nodeToTooltipMap[parent.id] = "newTabButton.tooltip";
-            }
-
-            gDynamicTooltipCache.delete(parent.id);
           }
 
           break;

diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
@@ -427,7 +427,6 @@ newWindowButton.tooltip=Open a new window (%S)
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=Open a new tab (%S)
-newTabContainer.tooltip=Open a new tab (%S)\nPress and hold to open a new container tab
 
 # Offline web applications
 offlineApps.available2=Will you allow %S to store data on your computer?