Bug 1363485 - Update BrowserUITelemetry.jsm r=Gijs

MozReview-Commit-ID: Ah8SAEADJ7O

--HG--
extra : rebase_source : 17e861ebcc30e65dc4668909849bbaf68ec0b196

browser/modules/BrowserUITelemetry.jsm

@@ -52,13 +52,15 @@ const LEGACY_PANEL_PLACEMENTS = [
 XPCOMUtils.defineLazyGetter(this, "DEFAULT_AREA_PLACEMENTS", function() {
   let result = {
     "nav-bar": [
+      "back-button",
+      "forward-button",
+      "stop-reload-button",
+      "home-button",
       "urlbar-container",
       "search-container",
       "bookmarks-menu-button",
-      "pocket-button",
       "downloads-button",
-      "home-button",
-      "social-share-button",
+      "sidebar-button",
     ],
     // It's true that toolbar-menubar is not visible
     // on OS X, but the XUL node is definitely present
@@ -76,10 +78,6 @@ XPCOMUtils.defineLazyGetter(this, "DEFAULT_AREA_PLACEMENTS", function() {
     ],
   };
 
-  if (AppConstants.MOZ_PHOTON_THEME) {
-    result["nav-bar"].push("sidebar-button");
-  }
-
   if (gPhotonStructure) {
     result["widget-overflow-fixed-list"] = [];
   } else {