Bug 865419 - Fix bad 3-way merge into UX branch. r=jaws.

This commit is contained in:
Mike Conley 2013-04-24 12:52:22 -04:00
parent 2b35279a27
commit 736fb82b33

View File

@ -929,6 +929,13 @@
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">