Bug 865419 - Fix bad 3-way merge into UX branch. r=jaws.
authorMike Conley <mconley@mozilla.com>
Wed, 24 Apr 2013 12:52:22 -0400
changeset 129766 fd26cf8fc03ae6f3155a65a1436274cbf808af97
parent 129765 4741bea99fbfbb113cbf76492f2a18431058de4d
child 129767 8bf747097b31911977bbfd6fc8f839456b851b29
child 130627 1ad9a6e8bf5c0d59408a0e79394db20f1b664232
push id8
push usermconley@mozilla.com
push dateWed, 24 Apr 2013 19:58:10 +0000
treeherderux@fd26cf8fc03a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs865419
milestone23.0a1
Bug 865419 - Fix bad 3-way merge into UX branch. r=jaws.
browser/base/content/browser.xul
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -924,16 +924,23 @@
                      label="&homeButton.label;"
                      ondragover="homeButtonObserver.onDragOver(event)"
                      ondragenter="homeButtonObserver.onDragOver(event)"
                      ondrop="homeButtonObserver.onDrop(event)"
                      ondragexit="homeButtonObserver.onDragExit(event)"
                      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();">
               <image class="social-statusarea-user-portrait"