666 + |
666 + |
667 + <toolbaritem id="social-toolbar-item" |
667 + <toolbaritem id="social-toolbar-item" |
668 + class="chromeclass-toolbar-additional" |
668 + class="chromeclass-toolbar-additional" |
669 + removable="false" |
669 + removable="false" |
670 + title="&socialToolbar.title;" |
670 + title="&socialToolbar.title;" |
671 + hidden="true"> |
671 + hidden="true" |
|
672 + observes="socialActiveBroadcaster"> |
672 + <toolbarbutton id="social-provider-button" |
673 + <toolbarbutton id="social-provider-button" |
673 + class="toolbarbutton-1" |
674 + class="toolbarbutton-1" |
674 + type="menu"> |
675 + type="menu"> |
675 + <menupopup id="social-statusarea-popup"> |
676 + <menupopup id="social-statusarea-popup"> |
676 + <menuitem id="social-statusarea-user" pack="start" align="center" class="menuitem-iconic" |
677 + <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center" |
677 + onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"> |
678 + observes="socialBroadcaster_userDetails" |
678 + <image id="social-statusarea-user-portrait"/> |
679 + oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"> |
|
680 + <image class="social-statusarea-user-portrait" |
|
681 + observes="socialBroadcaster_userDetails"/> |
679 + <vbox> |
682 + <vbox> |
680 + <label id="social-statusarea-notloggedin" |
683 + <label class="social-statusarea-loggedInStatus" |
681 + value="&social.notLoggedIn.label;"/> |
684 + observes="socialBroadcaster_userDetails"/> |
682 + <label id="social-statusarea-username"/> |
|
683 + </vbox> |
685 + </vbox> |
684 + </menuitem> |
686 + </menuitem> |
685 +#ifndef XP_WIN |
687 +#ifndef XP_WIN |
686 + <menuseparator/> |
688 + <menuseparator class="social-statusarea-separator"/> |
687 +#endif |
689 +#endif |
688 + <menuitem id="social-toggle-sidebar-menuitem" |
690 + <menuitem class="social-toggle-sidebar-menuitem" |
689 + type="checkbox" |
691 + type="checkbox" |
690 + autocheck="false" |
692 + autocheck="false" |
691 + command="Social:ToggleSidebar" |
693 + command="Social:ToggleSidebar" |
692 + label="&social.toggleSidebar.label;" |
694 + label="&social.toggleSidebar.label;" |
693 + accesskey="&social.toggleSidebar.accesskey;"/> |
695 + accesskey="&social.toggleSidebar.accesskey;"/> |
694 + <menuitem id="social-toggle-notifications-menuitem" |
696 + <menuitem class="social-toggle-notifications-menuitem" |
695 + type="checkbox" |
697 + type="checkbox" |
696 + autocheck="false" |
698 + autocheck="false" |
697 + command="Social:ToggleNotifications" |
699 + command="Social:ToggleNotifications" |
698 + label="&social.toggleNotifications.label;" |
700 + label="&social.toggleNotifications.label;" |
699 + accesskey="&social.toggleNotifications.accesskey;"/> |
701 + accesskey="&social.toggleNotifications.accesskey;"/> |
700 + <menuseparator/> |
702 + <menuseparator class="social-statusarea-separator"/> |
701 + <menuitem id="social-remove-menuitem" |
703 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
702 + oncommand="SocialUI.disableWithConfirmation();"/> |
704 + <menuitem class="social-remove-menuitem" command="Social:Remove"/> |
703 + </menupopup> |
705 + </menupopup> |
704 + </toolbarbutton> |
706 + </toolbarbutton> |
705 + </toolbaritem> |
707 + </toolbaritem> |
706 + |
708 + |
707 + <toolbaritem id="bookmarks-menu-button-container" |
709 + <toolbaritem id="bookmarks-menu-button-container" |
1845 + |
1847 + |
1846 +#endif // nsunixshellservice_h____ |
1848 +#endif // nsunixshellservice_h____ |
1847 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1849 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1848 --- a/browser/installer/package-manifest.in |
1850 --- a/browser/installer/package-manifest.in |
1849 +++ b/browser/installer/package-manifest.in |
1851 +++ b/browser/installer/package-manifest.in |
1850 @@ -579,18 +579,20 @@ |
1852 @@ -578,18 +578,20 @@ |
1851 @BINPATH@/@PREF_DIR@/healthreport-prefs.js |
1853 @BINPATH@/@PREF_DIR@/healthreport-prefs.js |
1852 #endif |
1854 #endif |
1853 @BINPATH@/greprefs.js |
1855 @BINPATH@/greprefs.js |
1854 @BINPATH@/defaults/autoconfig/platform.js |
1856 @BINPATH@/defaults/autoconfig/platform.js |
1855 @BINPATH@/defaults/autoconfig/prefcalls.js |
1857 @BINPATH@/defaults/autoconfig/prefcalls.js |