Bug 885075 - remove skipintoolbarset from social widget, r=mikedeboer
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 19 Jul 2013 12:30:40 +0200
changeset 155574 5dd57b76bc71a38ab1da17263f1a05ba532b12bb
parent 155573 47d9faf1a4bef1a7aa58470806c3bb45580db94a
child 155575 2dbad15d775e3edf0eb60bdb2ce7e4e80264889e
push id25666
push userjwein@mozilla.com
push dateMon, 18 Nov 2013 15:56:58 +0000
treeherdermozilla-central@f2adb62d07eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs885075
milestone25.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 885075 - remove skipintoolbarset from social widget, r=mikedeboer
browser/base/content/browser.xul
browser/components/customizableui/src/CustomizableUI.jsm
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -528,17 +528,17 @@
            Should you need to add items to the toolbar here, make sure to also add them
            to the default placements of buttons in CustomizableUI.jsm, so the
            customization code doesn't get confused.
       -->
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
-             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button"
+             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
              customizationtarget="nav-bar-customizationtarget"
              overflowbutton="nav-bar-overflow-button"
              overflowtarget="widget-overflow-list"
              context="toolbar-context-menu">
 
       <hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
         <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
                      forwarddisabled="true" title="&locationItem.title;" removable="false"
@@ -774,17 +774,16 @@
                        command="Social:SharePage"/>
 
         <toolbaritem id="social-toolbar-item"
                      class="chromeclass-toolbar-additional"
                      removable="false"
                      title="&socialToolbar.title;"
                      hidden="true"
                      nooverflow="true"
-                     skipintoolbarset="true"
                      observes="socialActiveBroadcaster">
         <toolbarbutton id="social-notification-icon" class="default-notification-icon toolbarbutton-1 notification-anchor-icon"
                    oncommand="PopupNotifications._reshowNotifications(this,
                                 document.getElementById('social-sidebar-browser'));"/>
           <toolbarbutton id="social-provider-button"
                          class="toolbarbutton-1"
                          type="menu">
             <menupopup id="social-statusarea-popup">
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -145,16 +145,17 @@ let CustomizableUIInternal = {
       defaultPlacements: [
         "urlbar-container",
         "search-container",
         "webrtc-status-button",
         "bookmarks-menu-button",
         "downloads-button",
         "home-button",
         "social-share-button",
+        "social-toolbar-item",
       ]
     });
 #ifndef XP_MACOSX
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
       defaultPlacements: [
         "menubar-items",