Bug 1364238 - Add the sidebar button into the default toolbar set;r=Gijs
authorBrian Grinstead <bgrinstead@mozilla.com>
Tue, 20 Jun 2017 08:42:28 -0700
changeset 365179 5c4c815e1ad575584c0c9dbf9350242406747d7d
parent 365178 9647f9c56e137e114af6de86a5cf9383611975fc
child 365180 74d8ec6397ee08180e001cc516b34a59e68bcd9c
push id45197
push userbgrinstead@mozilla.com
push dateWed, 21 Jun 2017 15:44:38 +0000
treeherderautoland@5c4c815e1ad5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1364238
milestone56.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 1364238 - Add the sidebar button into the default toolbar set;r=Gijs MozReview-Commit-ID: 7Z0ukSPu6pL
browser/components/customizableui/CustomizableUI.jsm
browser/modules/BrowserUITelemetry.jsm
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -241,16 +241,19 @@ var CustomizableUIInternal = {
     let navbarPlacements = [
       "urlbar-container",
       "search-container",
       "bookmarks-menu-button",
       "downloads-button",
       "home-button",
     ];
 
+    if (AppConstants.MOZ_PHOTON_THEME) {
+      navbarPlacements.push("sidebar-button");
+    }
     if (AppConstants.MOZ_DEV_EDITION) {
       navbarPlacements.splice(2, 0, "developer-button");
     }
 
     // Place this last, when createWidget is called for pocket, it will
     // append to the toolbar.
     if (Services.prefs.getPrefType("extensions.pocket.enabled") != Services.prefs.PREF_INVALID &&
         Services.prefs.getBoolPref("extensions.pocket.enabled")) {
--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/browser/modules/BrowserUITelemetry.jsm
@@ -71,16 +71,20 @@ XPCOMUtils.defineLazyGetter(this, "DEFAU
       "new-tab-button",
       "alltabs-button",
     ],
     "PersonalToolbar": [
       "personal-bookmarks",
     ],
   };
 
+  if (AppConstants.MOZ_PHOTON_THEME) {
+    result["nav-bar"].push("sidebar-button");
+  }
+
   if (gPhotonStructure) {
     result["widget-overflow-fixed-list"] = [];
   } else {
     result["PanelUI-contents"] = LEGACY_PANEL_PLACEMENTS;
     let showCharacterEncoding = Services.prefs.getComplexValue(
       "browser.menu.showCharacterEncoding",
       Ci.nsIPrefLocalizedString
     ).data;