Bug 1396839 - "Nightly Start Page" tooltip is displayed for "Home" button when Activity Stream overrides about:home. r?felipe,flod draft
authorEd Lee <edilee@mozilla.com>
Mon, 21 May 2018 11:41:58 -0700
changeset 797820 65145b038a3aadf756f5f67fa938e9ae1e2b9a7e
parent 796393 24bae072acb09114c367e6b9ffde9261b2ad8a58
push id110584
push userbmo:edilee@mozilla.com
push dateMon, 21 May 2018 19:15:20 +0000
reviewersfelipe, flod
bugs1396839
milestone62.0a1
Bug 1396839 - "Nightly Start Page" tooltip is displayed for "Home" button when Activity Stream overrides about:home. r?felipe,flod MozReview-Commit-ID: 8aDobXKBIg0
browser/base/content/browser-doctype.inc
browser/base/content/browser.xul
browser/locales/en-US/chrome/browser/browser.dtd
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -9,16 +9,14 @@
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
 %textcontextDTD;
 <!ENTITY % downloadsDTD SYSTEM "chrome://browser/locale/downloads/downloads.dtd">
 %downloadsDTD;
 <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
 %placesDTD;
 <!ENTITY % safebrowsingDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd">
 %safebrowsingDTD;
-<!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd">
-%aboutHomeDTD;
 <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
 %syncBrandDTD;
 <!ENTITY % reportphishDTD SYSTEM "chrome://browser/locale/safebrowsing/report-phishing.dtd">
 %reportphishDTD;
 <!ENTITY % editBookmarkOverlayDTD SYSTEM "chrome://browser/locale/places/editBookmarkOverlay.dtd">
 %editBookmarkOverlayDTD;
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -772,17 +772,17 @@
                        label="&homeButton.label;"
                        ondragover="homeButtonObserver.onDragOver(event)"
                        ondragenter="homeButtonObserver.onDragOver(event)"
                        ondrop="homeButtonObserver.onDrop(event)"
                        ondragexit="homeButtonObserver.onDragExit(event)"
                        key="goHome"
                        onclick="BrowserGoHome(event);"
                        cui-areatype="toolbar"
-                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+                       aboutHomeOverrideTooltip="&homeButton.defaultPage.tooltip;"/>
         <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
         <toolbaritem id="urlbar-container" flex="400" persist="width"
                      removable="false"
                      class="chromeclass-location" overflows="false">
             <textbox id="urlbar" flex="1"
                      placeholder="&urlbar.placeholder2;"
                      defaultPlaceholder="&urlbar.placeholder2;"
                      focused="true"
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -241,16 +241,17 @@ These should match what Safari and other
 <!ENTITY urlbar.midiBlocked.tooltip              "You have blocked MIDI access for this website.">
 
 <!ENTITY urlbar.openHistoryPopup.tooltip                "Show history">
 
 <!ENTITY searchItem.title             "Search">
 
 <!-- Toolbar items -->
 <!ENTITY homeButton.label             "Home">
+<!ENTITY homeButton.defaultPage.tooltip "&brandShortName; Home Page">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksSubview.label             "Bookmarks">
 <!ENTITY bookmarksMenuButton2.label         "Bookmarks Menu">
 <!ENTITY bookmarksMenuButton.other.label    "Other Bookmarks">
 <!ENTITY bookmarksMenuButton.mobile.label   "Mobile Bookmarks">