mozilla-central: changeset 114690:3d1c2eec5a9b43fbd586c16ea370a53a4e994a06

author	Mike Conley <mconley@mozilla.com>
	Fri, 30 Nov 2012 22:45:08 -0500
changeset 114690	3d1c2eec5a9b43fbd586c16ea370a53a4e994a06
parent 114689	5302f7fc78ae1d5c92a518d75564dce25dd0f1d3
child 114691	447dff867909781e0716c7098bcd8e53101b0093
push id	23926
push user	ryanvm@gmail.com
push date	Sat, 01 Dec 2012 15:27:30 +0000
treeherder	mozilla-central@ecdf0e332f17 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mak
bugs	811263
milestone	20.0a1
first release with	nightly linux32 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly linux64 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly mac 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly win32 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly win64 0352a32fde64 / 20.0a1 / 20121202030723 / files
last release without	nightly linux32 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly linux64 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly mac d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly win32 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly win64 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files

--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -642,16 +642,17 @@
                      onclick="BrowserGoHome(event);"
                      aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
       <toolbaritem id="social-toolbar-item"
                    class="chromeclass-toolbar-additional"
                    removable="false"
                    title="&socialToolbar.title;"
                    hidden="true"
+                   skipintoolbarset="true"
                    observes="socialActiveBroadcaster">
         <toolbarbutton id="social-provider-button"
                        class="toolbarbutton-1"
                        type="menu">
           <menupopup id="social-statusarea-popup">
             <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
                       observes="socialBroadcaster_userDetails"
                       oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">