185 + <panel id="socialActivatedNotification" |
185 + <panel id="socialActivatedNotification" |
186 + type="arrow" |
186 + type="arrow" |
187 + hidden="true" |
187 + hidden="true" |
188 + consumeoutsideclicks="true" |
188 + consumeoutsideclicks="true" |
189 + align="start" |
189 + align="start" |
|
190 + orient="horizontal" |
190 + role="alert"> |
191 + role="alert"> |
191 + <hbox flex="1"> |
192 + <image id="social-activation-icon" class="popup-notification-icon"/> |
192 + <image id="social-activation-icon" class="popup-notification-icon"/> |
193 + <vbox flex="1"> |
193 + <vbox flex="1"> |
194 + <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description> |
194 + <description id="social-activation-message" class="popup-notification-description"/> |
195 + <spacer flex="1"/> |
|
196 + <hbox pack="start" align="center" class="popup-notification-button-container"> |
|
197 + <label id="social-undoactivation-button" |
|
198 + class="text-link" |
|
199 + value="&social.activated.undo.label;" |
|
200 + accesskey="&social.activated.undo.accesskey;" |
|
201 + onclick="SocialUI.undoActivation(this);"/> |
195 + <spacer flex="1"/> |
202 + <spacer flex="1"/> |
196 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
203 + <button id="social-activation-button" |
197 +#ifndef XP_UNIX |
204 + default="true" |
198 + <button id="social-undoactivation-button" |
205 + autofocus="autofocus" |
199 + label="&social.activated.undobutton.label;" |
206 + label="&social.ok.label;" |
200 + accesskey="&social.activated.undobutton.accesskey;" |
207 + accesskey="&social.ok.accesskey;" |
201 + onclick="SocialUI.undoActivation(this);"/> |
208 + oncommand="SocialUI.activationPanel.hidePopup();"/> |
202 + <button default="true" |
209 + </hbox> |
203 + autofocus="autofocus" |
210 + </vbox> |
204 + label="&social.ok.label;" |
|
205 + accesskey="&social.ok.accesskey;" |
|
206 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
|
207 +#else |
|
208 + <button default="true" |
|
209 + autofocus="autofocus" |
|
210 + label="&social.ok.label;" |
|
211 + accesskey="&social.ok.accesskey;" |
|
212 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
|
213 + <button id="social-undoactivation-button" |
|
214 + label="&social.activated.undobutton.label;" |
|
215 + accesskey="&social.activated.undobutton.accesskey;" |
|
216 + onclick="SocialUI.undoActivation(this);"/> |
|
217 +#endif |
|
218 + </hbox> |
|
219 + </vbox> |
|
220 + </hbox> |
|
221 + </panel> |
211 + </panel> |
222 + |
212 + |
223 + <panel id="unsharePopup" |
213 + <panel id="social-share-panel" |
|
214 + class="social-panel" |
224 + type="arrow" |
215 + type="arrow" |
225 + orient="vertical" |
216 + orient="horizontal" |
226 + ignorekeys="true" |
217 + onpopupshowing="SocialShare.onShowing()" |
227 + hidden="true" |
218 + onpopuphidden="SocialShare.onHidden()" |
228 + onpopupshown="SocialShareButton.panelShown(event);" |
|
229 + consumeoutsideclicks="true" |
219 + consumeoutsideclicks="true" |
230 + level="top"> |
220 + hidden="true"> |
231 + <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes |
221 + <vbox class="social-share-toolbar"> |
232 + for many of these elements are supplied by the provider and filled |
222 + <vbox id="social-share-provider-buttons" flex="1"/> |
233 + in at runtime |
223 + </vbox> |
234 + --> |
|
235 + <row id="unsharePopupHeader" align="center"> |
|
236 + <vbox align="center"> |
|
237 + <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/> |
|
238 + </vbox> |
|
239 + <vbox id="unsharePopupText"> |
|
240 + <button id="socialUserDisplayName" pack="start" |
|
241 + oncommand="SocialUI.showProfile();"/> |
|
242 + <spacer flex="1"/> |
|
243 + <label id="socialUserRecommendedText"/> |
|
244 + </vbox> |
|
245 + </row> |
|
246 + <hbox id="unsharePopupBottomButtons" pack="end"> |
|
247 +#ifndef XP_UNIX |
|
248 + <button id="unsharePopupStopSharingButton" |
|
249 + class="unsharePopupBottomButton" |
|
250 + command="Social:UnsharePage"/> |
|
251 + <button id="unsharePopupContinueSharingButton" |
|
252 + class="unsharePopupBottomButton" |
|
253 + default="true" |
|
254 + autofocus="autofocus" |
|
255 + oncommand="SocialShareButton.dismissUnsharePopup();"/> |
|
256 +#else |
|
257 + <button id="unsharePopupContinueSharingButton" |
|
258 + class="unsharePopupBottomButton" |
|
259 + default="true" |
|
260 + autofocus="autofocus" |
|
261 + oncommand="SocialShareButton.dismissUnsharePopup();"/> |
|
262 + <button id="unsharePopupStopSharingButton" |
|
263 + class="unsharePopupBottomButton" |
|
264 + command="Social:UnsharePage"/> |
|
265 +#endif |
|
266 + </hbox> |
|
267 + </panel> |
224 + </panel> |
268 + |
225 + |
269 + <panel id="social-notification-panel" |
226 + <panel id="social-notification-panel" |
270 + class="social-panel" |
227 + class="social-panel" |
271 + type="arrow" |
228 + type="arrow" |
453 + <separator class="thin"/> |
410 + <separator class="thin"/> |
454 + <label id="geolocation-learnmore-link" class="text-link"/> |
411 + <label id="geolocation-learnmore-link" class="text-link"/> |
455 + </popupnotificationcontent> |
412 + </popupnotificationcontent> |
456 + </popupnotification> |
413 + </popupnotification> |
457 + |
414 + |
|
415 + <popupnotification id="servicesInstall-notification" hidden="true"> |
|
416 + <popupnotificationcontent orient="vertical" align="start"> |
|
417 + <separator class="thin"/> |
|
418 + <label id="servicesInstall-learnmore-link" class="text-link"/> |
|
419 + </popupnotificationcontent> |
|
420 + </popupnotification> |
|
421 + |
458 + <popupnotification id="pointerLock-notification" hidden="true"> |
422 + <popupnotification id="pointerLock-notification" hidden="true"> |
459 + <popupnotificationcontent orient="vertical" align="start"> |
423 + <popupnotificationcontent orient="vertical" align="start"> |
460 + <separator class="thin"/> |
424 + <separator class="thin"/> |
461 + <label id="pointerLock-cancel" value="&pointerLock.notification.message;"/> |
425 + <label id="pointerLock-cancel" value="&pointerLock.notification.message;"/> |
462 + </popupnotificationcontent> |
426 + </popupnotificationcontent> |
529 + |
493 + |
530 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
494 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
531 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
495 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
532 + fullscreentoolbar="true" mode="icons" customizable="true" |
496 + fullscreentoolbar="true" mode="icons" customizable="true" |
533 + iconsize="large" |
497 + iconsize="large" |
534 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls" |
498 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls" |
535 + context="toolbar-context-menu"> |
499 + context="toolbar-context-menu"> |
536 + |
500 + |
537 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
501 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
538 + context="backForwardMenu" removable="true" |
502 + context="backForwardMenu" removable="true" |
539 + forwarddisabled="true" |
503 + forwarddisabled="true" |
587 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
551 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
588 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
552 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
589 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
553 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
590 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
554 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
591 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
555 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
|
556 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
592 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
557 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
593 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
558 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
594 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
559 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
595 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
560 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
|
561 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
596 + </box> |
562 + </box> |
597 + <!-- Use onclick instead of normal popup= syntax since the popup |
563 + <!-- Use onclick instead of normal popup= syntax since the popup |
598 + code fires onmousedown, and hence eats our favicon drag events. |
564 + code fires onmousedown, and hence eats our favicon drag events. |
599 + We only add the identity-box button to the tab order when the location bar |
565 + We only add the identity-box button to the tab order when the location bar |
600 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
566 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
618 + <image id="page-report-button" |
584 + <image id="page-report-button" |
619 + class="urlbar-icon" |
585 + class="urlbar-icon" |
620 + hidden="true" |
586 + hidden="true" |
621 + tooltiptext="&pageReportIcon.tooltip;" |
587 + tooltiptext="&pageReportIcon.tooltip;" |
622 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
588 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
623 + |
|
624 + <label id="share-button-status" collapsed="true" role="status"/> |
|
625 + <image id="share-button" |
|
626 + class="urlbar-icon" |
|
627 + hidden="true" |
|
628 + onclick="SocialShareButton.onClick(event);"/> |
|
629 + |
|
630 + <image id="star-button" |
589 + <image id="star-button" |
631 + class="urlbar-icon" |
590 + class="urlbar-icon" |
632 + onclick="PlacesStarButton.onClick(event);"/> |
591 + onclick="BookmarkingUI.onCommand(event);"/> |
633 + <image id="go-button" |
592 + <image id="go-button" |
634 + class="urlbar-icon" |
593 + class="urlbar-icon" |
635 + tooltiptext="&goEndCap.tooltip;" |
594 + tooltiptext="&goEndCap.tooltip;" |
636 + onclick="gURLBar.handleCommand(event);"/> |
595 + onclick="gURLBar.handleCommand(event);"/> |
637 + </hbox> |
596 + </hbox> |
678 + <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);" |
637 + <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);" |
679 + onpopuphiding="WebrtcIndicator.clearPopup(this);" |
638 + onpopuphiding="WebrtcIndicator.clearPopup(this);" |
680 + oncommand="WebrtcIndicator.menuCommand(event.target);"/> |
639 + oncommand="WebrtcIndicator.menuCommand(event.target);"/> |
681 + </toolbarbutton> |
640 + </toolbarbutton> |
682 + |
641 + |
|
642 + <toolbarbutton id="bookmarks-menu-button" |
|
643 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
644 + persist="class" |
|
645 + removable="true" |
|
646 + type="menu" |
|
647 + label="&bookmarksMenuButton.label;" |
|
648 + tooltiptext="&bookmarksMenuButton.tooltip;" |
|
649 + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
|
650 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
|
651 + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
|
652 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
|
653 + <menupopup id="BMB_bookmarksPopup" |
|
654 + placespopup="true" |
|
655 + context="placesContext" |
|
656 + openInTabs="children" |
|
657 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
|
658 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
|
659 + onpopupshowing="BookmarkingUI.onPopupShowing(event); |
|
660 + if (!this.parentNode._placesView) |
|
661 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
|
662 + tooltip="bhTooltip" popupsinherittooltip="true"> |
|
663 + <menuitem id="BMB_viewBookmarksToolbar" |
|
664 + placesanonid="view-toolbar" |
|
665 + toolbarId="PersonalToolbar" |
|
666 + type="checkbox" |
|
667 + oncommand="onViewToolbarCommand(event)" |
|
668 + label="&viewBookmarksToolbar.label;"/> |
|
669 + <menuseparator/> |
|
670 + <menuitem id="BMB_bookmarksShowAll" |
|
671 + label="&showAllBookmarks2.label;" |
|
672 + command="Browser:ShowAllBookmarks" |
|
673 + key="manBookmarkKb"/> |
|
674 + <menuseparator/> |
|
675 + <menuitem id="BMB_bookmarkThisPage" |
|
676 +#ifndef XP_MACOSX |
|
677 + class="menuitem-iconic" |
|
678 +#endif |
|
679 + label="&bookmarkThisPageCmd.label;" |
|
680 + command="Browser:AddBookmarkAs" |
|
681 + key="addBookmarkAsKb"/> |
|
682 + <menuitem id="BMB_subscribeToPageMenuitem" |
|
683 +#ifndef XP_MACOSX |
|
684 + class="menuitem-iconic" |
|
685 +#endif |
|
686 + label="&subscribeToPageMenuitem.label;" |
|
687 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
688 + onclick="checkForMiddleClick(this, event);" |
|
689 + observes="singleFeedMenuitemState"/> |
|
690 + <menu id="BMB_subscribeToPageMenupopup" |
|
691 +#ifndef XP_MACOSX |
|
692 + class="menu-iconic" |
|
693 +#endif |
|
694 + label="&subscribeToPageMenupopup.label;" |
|
695 + observes="multipleFeedsMenuState"> |
|
696 + <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
|
697 + onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
|
698 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
699 + onclick="checkForMiddleClick(this, event);"/> |
|
700 + </menu> |
|
701 + <menuseparator/> |
|
702 + <menu id="BMB_bookmarksToolbar" |
|
703 + placesanonid="toolbar-autohide" |
|
704 + class="menu-iconic bookmark-item" |
|
705 + label="&personalbarCmd.label;" |
|
706 + container="true"> |
|
707 + <menupopup id="BMB_bookmarksToolbarPopup" |
|
708 + placespopup="true" |
|
709 + context="placesContext" |
|
710 + onpopupshowing="if (!this.parentNode._placesView) |
|
711 + new PlacesMenu(event, 'place:folder=TOOLBAR');"/> |
|
712 + </menu> |
|
713 + <menuseparator/> |
|
714 + <!-- Bookmarks menu items --> |
|
715 + <menuseparator builder="end" |
|
716 + class="hide-if-empty-places-result"/> |
|
717 + <menuitem id="BMB_unsortedBookmarks" |
|
718 + label="&bookmarksMenuButton.unsorted.label;" |
|
719 + oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" |
|
720 + class="menuitem-iconic"/> |
|
721 + </menupopup> |
|
722 + </toolbarbutton> |
|
723 + |
683 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
724 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
684 + persist="class" removable="true" |
725 + persist="class" removable="true" |
685 + label="&homeButton.label;" |
726 + label="&homeButton.label;" |
686 + ondragover="homeButtonObserver.onDragOver(event)" |
727 + ondragover="homeButtonObserver.onDragOver(event)" |
687 + ondragenter="homeButtonObserver.onDragOver(event)" |
728 + ondragenter="homeButtonObserver.onDragOver(event)" |
688 + ondrop="homeButtonObserver.onDrop(event)" |
729 + ondrop="homeButtonObserver.onDrop(event)" |
689 + ondragexit="homeButtonObserver.onDragExit(event)" |
730 + ondragexit="homeButtonObserver.onDragExit(event)" |
690 + onclick="BrowserGoHome(event);" |
731 + onclick="BrowserGoHome(event);" |
691 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
732 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
|
733 + |
|
734 + <toolbarbutton id="social-share-button" |
|
735 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
736 + hidden="true" |
|
737 + label="&sharePageCmd.label;" |
|
738 + tooltiptext="&sharePageCmd.label;" |
|
739 + command="Social:SharePage"/> |
692 + |
740 + |
693 + <toolbaritem id="social-toolbar-item" |
741 + <toolbaritem id="social-toolbar-item" |
694 + class="chromeclass-toolbar-additional" |
742 + class="chromeclass-toolbar-additional" |
695 + removable="false" |
743 + removable="false" |
696 + title="&socialToolbar.title;" |
744 + title="&socialToolbar.title;" |
725 + autocheck="false" |
773 + autocheck="false" |
726 + command="Social:ToggleNotifications" |
774 + command="Social:ToggleNotifications" |
727 + label="&social.toggleNotifications.label;" |
775 + label="&social.toggleNotifications.label;" |
728 + accesskey="&social.toggleNotifications.accesskey;"/> |
776 + accesskey="&social.toggleNotifications.accesskey;"/> |
729 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
777 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
730 + <menuseparator class="social-statusarea-separator"/> |
778 + <menuseparator/> |
731 + <menuseparator class="social-provider-menu" hidden="true"/> |
779 + <menuseparator class="social-provider-menu" hidden="true"/> |
732 + <menuitem class="social-addons-menuitem" command="Social:Addons" |
780 + <menuitem class="social-addons-menuitem" command="Social:Addons" |
733 + label="&social.addons.label;"/> |
781 + label="&social.addons.label;"/> |
|
782 + <menuitem label="&social.learnMore.label;" |
|
783 + accesskey="&social.learnMore.accesskey;" |
|
784 + oncommand="SocialUI.showLearnMore();"/> |
734 + </menupopup> |
785 + </menupopup> |
735 + </toolbarbutton> |
786 + </toolbarbutton> |
736 + </toolbaritem> |
787 + <toolbarbutton id="social-mark-button" |
737 + |
|
738 + <toolbaritem id="bookmarks-menu-button-container" |
|
739 + class="chromeclass-toolbar-additional" |
|
740 + removable="true" |
|
741 + title="&bookmarksMenuButton.label;"> |
|
742 + <toolbarbutton id="bookmarks-menu-button" |
|
743 + type="menu" |
|
744 + class="toolbarbutton-1" |
788 + class="toolbarbutton-1" |
745 + label="&bookmarksMenuButton.label;" |
789 + hidden="true" |
746 + tooltiptext="&bookmarksMenuButton.tooltip;" |
790 + disabled="true" |
747 + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
791 + command="Social:TogglePageMark"/> |
748 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
|
749 + ondragexit="PlacesMenuDNDHandler.onDragExit(event);" |
|
750 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
|
751 + <menupopup id="BMB_bookmarksPopup" |
|
752 + placespopup="true" |
|
753 + context="placesContext" |
|
754 + openInTabs="children" |
|
755 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
|
756 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
|
757 + onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
|
758 + if (!this.parentNode._placesView) |
|
759 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
|
760 + tooltip="bhTooltip" popupsinherittooltip="true"> |
|
761 + <menuitem id="BMB_viewBookmarksToolbar" |
|
762 + placesanonid="view-toolbar" |
|
763 + toolbarId="PersonalToolbar" |
|
764 + type="checkbox" |
|
765 + oncommand="onViewToolbarCommand(event)" |
|
766 + label="&viewBookmarksToolbar.label;"/> |
|
767 + <menuseparator/> |
|
768 + <menuitem id="BMB_bookmarksShowAll" |
|
769 + label="&showAllBookmarks2.label;" |
|
770 + command="Browser:ShowAllBookmarks" |
|
771 + key="manBookmarkKb"/> |
|
772 + <menuseparator/> |
|
773 + <menuitem id="BMB_bookmarkThisPage" |
|
774 +#ifndef XP_MACOSX |
|
775 + class="menuitem-iconic" |
|
776 +#endif |
|
777 + label="&bookmarkThisPageCmd.label;" |
|
778 + command="Browser:AddBookmarkAs" |
|
779 + key="addBookmarkAsKb"/> |
|
780 + <menuitem id="BMB_subscribeToPageMenuitem" |
|
781 +#ifndef XP_MACOSX |
|
782 + class="menuitem-iconic" |
|
783 +#endif |
|
784 + label="&subscribeToPageMenuitem.label;" |
|
785 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
786 + onclick="checkForMiddleClick(this, event);" |
|
787 + observes="singleFeedMenuitemState"/> |
|
788 + <menu id="BMB_subscribeToPageMenupopup" |
|
789 +#ifndef XP_MACOSX |
|
790 + class="menu-iconic" |
|
791 +#endif |
|
792 + label="&subscribeToPageMenupopup.label;" |
|
793 + observes="multipleFeedsMenuState"> |
|
794 + <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
|
795 + onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
|
796 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
797 + onclick="checkForMiddleClick(this, event);"/> |
|
798 + </menu> |
|
799 + <menuseparator/> |
|
800 + <menu id="BMB_bookmarksToolbar" |
|
801 + placesanonid="toolbar-autohide" |
|
802 + class="menu-iconic bookmark-item" |
|
803 + label="&personalbarCmd.label;" |
|
804 + container="true"> |
|
805 + <menupopup id="BMB_bookmarksToolbarPopup" |
|
806 + placespopup="true" |
|
807 + context="placesContext" |
|
808 + onpopupshowing="if (!this.parentNode._placesView) |
|
809 + new PlacesMenu(event, 'place:folder=TOOLBAR');"/> |
|
810 + </menu> |
|
811 + <menuseparator/> |
|
812 + <!-- Bookmarks menu items --> |
|
813 + <menuseparator builder="end" |
|
814 + class="hide-if-empty-places-result"/> |
|
815 + <menuitem id="BMB_unsortedBookmarks" |
|
816 + label="&bookmarksMenuButton.unsorted.label;" |
|
817 + oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" |
|
818 + class="menuitem-iconic"/> |
|
819 + </menupopup> |
|
820 + </toolbarbutton> |
|
821 + </toolbaritem> |
792 + </toolbaritem> |
822 + |
793 + |
823 + <hbox id="window-controls" hidden="true" pack="end"> |
794 + <hbox id="window-controls" hidden="true" pack="end"> |
824 + <toolbarbutton id="minimize-button" |
795 + <toolbarbutton id="minimize-button" |
825 + tooltiptext="&fullScreenMinimize.tooltip;" |
796 + tooltiptext="&fullScreenMinimize.tooltip;" |
1247 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1218 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1248 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1219 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1249 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1220 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1250 content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) |
1221 content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) |
1251 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1222 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1252 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1223 content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1253 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1224 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1254 --- a/browser/components/build/nsModule.cpp |
1225 --- a/browser/components/build/nsModule.cpp |
1255 +++ b/browser/components/build/nsModule.cpp |
1226 +++ b/browser/components/build/nsModule.cpp |
1256 @@ -8,17 +8,17 @@ |
1227 @@ -8,17 +8,17 @@ |
1257 #include "nsBrowserCompsCID.h" |
1228 #include "nsBrowserCompsCID.h" |
1334 // In Windows 8 we launch the control panel since it's the only |
1305 // In Windows 8 we launch the control panel since it's the only |
1335 // way to get all file type association prefs. So we don't know |
1306 // way to get all file type association prefs. So we don't know |
1336 // when the user will select the default. We refresh here periodically |
1307 // when the user will select the default. We refresh here periodically |
1337 // in case the default changes. On other Windows OS's defaults can also |
1308 // in case the default changes. On other Windows OS's defaults can also |
1338 // be set while the prefs are open. |
1309 // be set while the prefs are open. |
1339 @@ -792,14 +798,25 @@ var gAdvancedPane = { |
1310 @@ -797,14 +803,25 @@ var gAdvancedPane = { |
1340 * Set browser as the operating system default browser. |
1311 * Set browser as the operating system default browser. |
1341 */ |
1312 */ |
1342 setDefaultBrowser: function() |
1313 setDefaultBrowser: function() |
1343 { |
1314 { |
1344 let shellSvc = getShellService(); |
1315 let shellSvc = getShellService(); |