47 + lightweightthemes="true" |
47 + lightweightthemes="true" |
48 + lightweightthemesfooter="browser-bottombox" |
48 + lightweightthemesfooter="browser-bottombox" |
49 + windowtype="navigator:browser" |
49 + windowtype="navigator:browser" |
50 + macanimationtype="document" |
50 + macanimationtype="document" |
51 + screenX="4" screenY="4" |
51 + screenX="4" screenY="4" |
52 + browsingmode="normal" |
|
53 + fullscreenbutton="true" |
52 + fullscreenbutton="true" |
54 + persist="screenX screenY width height sizemode"> |
53 + persist="screenX screenY width height sizemode"> |
55 + |
54 + |
56 +# All JS files which are not content (only) dependent that browser.xul |
55 +# All JS files which are not content (only) dependent that browser.xul |
57 +# wishes to include *must* go into the global-scripts.inc file |
56 +# wishes to include *must* go into the global-scripts.inc file |
197 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
196 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
198 +#ifndef XP_UNIX |
197 +#ifndef XP_UNIX |
199 + <button id="social-undoactivation-button" |
198 + <button id="social-undoactivation-button" |
200 + label="&social.activated.undobutton.label;" |
199 + label="&social.activated.undobutton.label;" |
201 + accesskey="&social.activated.undobutton.accesskey;" |
200 + accesskey="&social.activated.undobutton.accesskey;" |
202 + onclick="SocialUI.undoActivation();"/> |
201 + onclick="SocialUI.undoActivation(this);"/> |
203 + <button default="true" |
202 + <button default="true" |
204 + autofocus="autofocus" |
203 + autofocus="autofocus" |
205 + label="&social.ok.label;" |
204 + label="&social.ok.label;" |
206 + accesskey="&social.ok.accesskey;" |
205 + accesskey="&social.ok.accesskey;" |
207 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
206 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
212 + accesskey="&social.ok.accesskey;" |
211 + accesskey="&social.ok.accesskey;" |
213 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
212 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
214 + <button id="social-undoactivation-button" |
213 + <button id="social-undoactivation-button" |
215 + label="&social.activated.undobutton.label;" |
214 + label="&social.activated.undobutton.label;" |
216 + accesskey="&social.activated.undobutton.accesskey;" |
215 + accesskey="&social.activated.undobutton.accesskey;" |
217 + onclick="SocialUI.undoActivation();"/> |
216 + onclick="SocialUI.undoActivation(this);"/> |
218 +#endif |
217 +#endif |
219 + </hbox> |
218 + </hbox> |
220 + </vbox> |
219 + </vbox> |
221 + </hbox> |
220 + </hbox> |
222 + </panel> |
221 + </panel> |
280 + side="right" |
279 + side="right" |
281 + type="arrow" |
280 + type="arrow" |
282 + hidden="true" |
281 + hidden="true" |
283 + noautofocus="true" |
282 + noautofocus="true" |
284 + position="topcenter topright"/> |
283 + position="topcenter topright"/> |
285 + |
|
286 + <menupopup id="inspector-node-popup"> |
|
287 + <menuitem id="inspectorHTMLCopyInner" |
|
288 + label="&inspectorHTMLCopyInner.label;" |
|
289 + accesskey="&inspectorHTMLCopyInner.accesskey;" |
|
290 + command="Inspector:CopyInner"/> |
|
291 + <menuitem id="inspectorHTMLCopyOuter" |
|
292 + label="&inspectorHTMLCopyOuter.label;" |
|
293 + accesskey="&inspectorHTMLCopyOuter.accesskey;" |
|
294 + command="Inspector:CopyOuter"/> |
|
295 + <menuseparator/> |
|
296 + <menuitem id="inspectorHTMLDelete" |
|
297 + label="&inspectorHTMLDelete.label;" |
|
298 + accesskey="&inspectorHTMLDelete.accesskey;" |
|
299 + command="Inspector:DeleteNode"/> |
|
300 + </menupopup> |
|
301 + |
284 + |
302 + <menupopup id="toolbar-context-menu" |
285 + <menupopup id="toolbar-context-menu" |
303 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
286 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
304 + <menuseparator/> |
287 + <menuseparator/> |
305 + <menuitem command="cmd_ToggleTabsOnTop" |
288 + <menuitem command="cmd_ToggleTabsOnTop" |
463 + <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
446 + <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
464 +#else |
447 +#else |
465 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
448 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
466 +#endif |
449 +#endif |
467 + </tooltip> |
450 + </tooltip> |
|
451 + |
|
452 + <popupnotification id="webRTC-shareDevices-notification" hidden="true"> |
|
453 + <popupnotificationcontent id="webRTC-selectCamera" orient="vertical"> |
|
454 + <separator class="thin"/> |
|
455 + <label value="&getUserMedia.selectCamera.label;" |
|
456 + accesskey="&getUserMedia.selectCamera.accesskey;" |
|
457 + control="webRTC-selectCamera-menulist"/> |
|
458 + <menulist id="webRTC-selectCamera-menulist"> |
|
459 + <menupopup id="webRTC-selectCamera-menupopup"/> |
|
460 + </menulist> |
|
461 + </popupnotificationcontent> |
|
462 + <popupnotificationcontent id="webRTC-selectMicrophone" orient="vertical"> |
|
463 + <separator class="thin"/> |
|
464 + <label value="&getUserMedia.selectMicrophone.label;" |
|
465 + accesskey="&getUserMedia.selectMicrophone.accesskey;" |
|
466 + control="webRTC-selectMicrophone-menulist"/> |
|
467 + <menulist id="webRTC-selectMicrophone-menulist"> |
|
468 + <menupopup id="webRTC-selectMicrophone-menupopup"/> |
|
469 + </menulist> |
|
470 + </popupnotificationcontent> |
|
471 + </popupnotification> |
|
472 + |
|
473 + <popupnotification id="geolocation-notification" hidden="true"> |
|
474 + <popupnotificationcontent orient="vertical" align="start"> |
|
475 + <separator class="thin"/> |
|
476 + <label id="geolocation-learnmore-link" class="text-link"/> |
|
477 + </popupnotificationcontent> |
|
478 + </popupnotification> |
468 + </popupset> |
479 + </popupset> |
469 + |
480 + |
470 +#ifdef CAN_DRAW_IN_TITLEBAR |
481 +#ifdef CAN_DRAW_IN_TITLEBAR |
471 +<vbox id="titlebar"> |
482 +<vbox id="titlebar"> |
472 + <hbox id="titlebar-content"> |
483 + <hbox id="titlebar-content"> |
520 + |
531 + |
521 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
532 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
522 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
533 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
523 + fullscreentoolbar="true" mode="icons" customizable="true" |
534 + fullscreentoolbar="true" mode="icons" customizable="true" |
524 + iconsize="large" |
535 + iconsize="large" |
525 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls" |
536 + 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" |
526 + context="toolbar-context-menu"> |
537 + context="toolbar-context-menu"> |
527 + |
538 + |
528 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
539 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
529 + context="backForwardMenu" removable="true" |
540 + context="backForwardMenu" removable="true" |
530 + forwarddisabled="true" |
541 + forwarddisabled="true" |
577 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
588 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
578 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
589 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
579 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
590 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
580 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
591 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
581 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
592 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
|
593 + <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"/> |
582 + </box> |
595 + </box> |
583 + <!-- Use onclick instead of normal popup= syntax since the popup |
596 + <!-- Use onclick instead of normal popup= syntax since the popup |
584 + code fires onmousedown, and hence eats our favicon drag events. |
597 + code fires onmousedown, and hence eats our favicon drag events. |
585 + We only add the identity-box button to the tab order when the location bar |
598 + We only add the identity-box button to the tab order when the location bar |
586 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
599 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
652 + align="center" class="chromeclass-toolbar-additional" |
665 + align="center" class="chromeclass-toolbar-additional" |
653 + flex="100" persist="width" removable="true"> |
666 + flex="100" persist="width" removable="true"> |
654 + <searchbar id="searchbar" flex="1"/> |
667 + <searchbar id="searchbar" flex="1"/> |
655 + </toolbaritem> |
668 + </toolbaritem> |
656 + |
669 + |
|
670 + <toolbarbutton id="webrtc-status-button" |
|
671 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
672 + type="menu" |
|
673 + hidden="true" |
|
674 + orient="horizontal" |
|
675 + label="&webrtcIndicatorButton.label;" |
|
676 + tooltiptext="&webrtcIndicatorButton.tooltip;"> |
|
677 + <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);" |
|
678 + onpopuphiding="WebrtcIndicator.clearPopup(this);" |
|
679 + oncommand="WebrtcIndicator.menuCommand(event.target);"/> |
|
680 + </toolbarbutton> |
|
681 + |
657 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
682 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
658 + persist="class" removable="true" |
683 + persist="class" removable="true" |
659 + label="&homeButton.label;" |
684 + label="&homeButton.label;" |
660 + ondragover="homeButtonObserver.onDragOver(event)" |
685 + ondragover="homeButtonObserver.onDragOver(event)" |
661 + ondragenter="homeButtonObserver.onDragOver(event)" |
686 + ondragenter="homeButtonObserver.onDragOver(event)" |
667 + <toolbaritem id="social-toolbar-item" |
692 + <toolbaritem id="social-toolbar-item" |
668 + class="chromeclass-toolbar-additional" |
693 + class="chromeclass-toolbar-additional" |
669 + removable="false" |
694 + removable="false" |
670 + title="&socialToolbar.title;" |
695 + title="&socialToolbar.title;" |
671 + hidden="true" |
696 + hidden="true" |
|
697 + skipintoolbarset="true" |
672 + observes="socialActiveBroadcaster"> |
698 + observes="socialActiveBroadcaster"> |
673 + <toolbarbutton id="social-provider-button" |
699 + <toolbarbutton id="social-provider-button" |
674 + class="toolbarbutton-1" |
700 + class="toolbarbutton-1" |
675 + type="menu"> |
701 + type="menu"> |
676 + <menupopup id="social-statusarea-popup"> |
702 + <menupopup id="social-statusarea-popup"> |
698 + autocheck="false" |
724 + autocheck="false" |
699 + command="Social:ToggleNotifications" |
725 + command="Social:ToggleNotifications" |
700 + label="&social.toggleNotifications.label;" |
726 + label="&social.toggleNotifications.label;" |
701 + accesskey="&social.toggleNotifications.accesskey;"/> |
727 + accesskey="&social.toggleNotifications.accesskey;"/> |
702 + <menuseparator class="social-statusarea-separator"/> |
728 + <menuseparator class="social-statusarea-separator"/> |
|
729 + <menuseparator class="social-provider-menu" hidden="true"/> |
703 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
730 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
704 + <menuitem class="social-remove-menuitem" command="Social:Remove"/> |
731 + <menuitem class="social-remove-menuitem" command="Social:Remove"/> |
705 + </menupopup> |
732 + </menupopup> |
706 + </toolbarbutton> |
733 + </toolbarbutton> |
707 + </toolbaritem> |
734 + </toolbaritem> |
891 + <tabs id="tabbrowser-tabs" |
918 + <tabs id="tabbrowser-tabs" |
892 + class="tabbrowser-tabs" |
919 + class="tabbrowser-tabs" |
893 + tabbrowser="content" |
920 + tabbrowser="content" |
894 + flex="1" |
921 + flex="1" |
895 + setfocus="false" |
922 + setfocus="false" |
896 + tooltip="tabbrowser-tab-tooltip"> |
923 + tooltip="tabbrowser-tab-tooltip" |
|
924 + stopwatchid="FX_TAB_CLICK_MS"> |
897 + <tab class="tabbrowser-tab" selected="true" fadein="true"/> |
925 + <tab class="tabbrowser-tab" selected="true" fadein="true"/> |
898 + </tabs> |
926 + </tabs> |
899 + |
927 + |
900 + <toolbarbutton id="new-tab-button" |
928 + <toolbarbutton id="new-tab-button" |
901 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
929 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
1046 + tooltiptext="&tabGroupsButton.tooltip;" |
1074 + tooltiptext="&tabGroupsButton.tooltip;" |
1047 + observes="tabviewGroupsNumber"/> |
1075 + observes="tabviewGroupsNumber"/> |
1048 + </toolbarpalette> |
1076 + </toolbarpalette> |
1049 + </toolbox> |
1077 + </toolbox> |
1050 + |
1078 + |
|
1079 + <hbox id="fullscr-toggler" collapsed="true"/> |
|
1080 + |
1051 + <hbox flex="1" id="browser"> |
1081 + <hbox flex="1" id="browser"> |
1052 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1082 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1053 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1083 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1054 + <sidebarheader id="sidebar-header" align="center"> |
1084 + <sidebarheader id="sidebar-header" align="center"> |
1055 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1085 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1068 + contentcontextmenu="contentAreaContextMenu" |
1098 + contentcontextmenu="contentAreaContextMenu" |
1069 + autocompletepopup="PopupAutoComplete" |
1099 + autocompletepopup="PopupAutoComplete" |
1070 + onclick="contentAreaClick(event, false);"/> |
1100 + onclick="contentAreaClick(event, false);"/> |
1071 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1101 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1072 + <statuspanel id="statusbar-display" inactive="true"/> |
1102 + <statuspanel id="statusbar-display" inactive="true"/> |
1073 + </vbox> |
|
1074 + <splitter id="devtools-side-splitter" hidden="true"/> |
|
1075 + <vbox id="devtools-sidebar-box" hidden="true" |
|
1076 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
|
1077 + <toolbar id="devtools-sidebar-toolbar" |
|
1078 + class="devtools-toolbar" |
|
1079 + nowindowdrag="true"> |
|
1080 + <spacer flex="1"/> |
|
1081 + <toolbarbutton tooltiptext="&inspectSidebarCloseButton.tooltiptext;" |
|
1082 + class="devtools-closebutton" |
|
1083 + command="Inspector:Sidebar"/> |
|
1084 + </toolbar> |
|
1085 + <deck id="devtools-sidebar-deck" flex="1"/> |
|
1086 + </vbox> |
1103 + </vbox> |
1087 + <splitter id="social-sidebar-splitter" |
1104 + <splitter id="social-sidebar-splitter" |
1088 + class="chromeclass-extrachrome sidebar-splitter" |
1105 + class="chromeclass-extrachrome sidebar-splitter" |
1089 + observes="socialSidebarBroadcaster"/> |
1106 + observes="socialSidebarBroadcaster"/> |
1090 + <vbox id="social-sidebar-box" |
1107 + <vbox id="social-sidebar-box" |
1120 + </vbox> |
1137 + </vbox> |
1121 + </hbox> |
1138 + </hbox> |
1122 + </hbox> |
1139 + </hbox> |
1123 + |
1140 + |
1124 + <vbox id="browser-bottombox" layer="true"> |
1141 + <vbox id="browser-bottombox" layer="true"> |
1125 + <toolbar id="inspector-toolbar" |
|
1126 + class="devtools-toolbar" |
|
1127 + nowindowdrag="true" |
|
1128 + hidden="true"> |
|
1129 +#ifdef XP_MACOSX |
|
1130 + <toolbarbutton id="highlighter-closebutton" |
|
1131 + class="devtools-closebutton" |
|
1132 + oncommand="InspectorUI.closeInspectorUI(false);" |
|
1133 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
|
1134 +#endif |
|
1135 + <toolbarbutton id="inspector-inspect-toolbutton" |
|
1136 + class="devtools-toolbarbutton" |
|
1137 + command="Inspector:Inspect"/> |
|
1138 + <toolbarbutton id="inspector-treepanel-toolbutton" |
|
1139 + class="devtools-toolbarbutton" |
|
1140 + tabindex="0" |
|
1141 + aria-label="&markupButton.arialabel;" |
|
1142 + accesskey="&markupButton.accesskey;" |
|
1143 + command="Inspector:HTMLPanel"/> |
|
1144 + <arrowscrollbox id="inspector-breadcrumbs" |
|
1145 + flex="1" orient="horizontal" |
|
1146 + clicktoscroll="true"/> |
|
1147 + <hbox id="inspector-tools"> |
|
1148 + <toolbarbutton id="inspector-3D-button" |
|
1149 + class="devtools-toolbarbutton" |
|
1150 + hidden="true" |
|
1151 + label="&inspect3DViewButton.label;" |
|
1152 + accesskey="&inspect3DViewButton.accesskey;" |
|
1153 + tabindex="0" |
|
1154 + command="Inspector:Tilt"/> |
|
1155 + <toolbarbutton id="inspector-style-button" |
|
1156 + class="devtools-toolbarbutton" |
|
1157 + label="&inspectStyleButton.label;" |
|
1158 + accesskey="&inspectStyleButton.accesskey;" |
|
1159 + tabindex="0" |
|
1160 + command="Inspector:Sidebar"/> |
|
1161 + <!-- registered tools go here --> |
|
1162 + </hbox> |
|
1163 +#ifndef XP_MACOSX |
|
1164 + <toolbarbutton id="highlighter-closebutton" |
|
1165 + class="devtools-closebutton" |
|
1166 + oncommand="InspectorUI.closeInspectorUI(false);" |
|
1167 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
|
1168 +#endif |
|
1169 + </toolbar> |
|
1170 + |
|
1171 + <toolbar id="developer-toolbar" |
1142 + <toolbar id="developer-toolbar" |
1172 + class="devtools-toolbar" |
1143 + class="devtools-toolbar" |
1173 + hidden="true"> |
1144 + hidden="true"> |
1174 +#ifdef XP_MACOSX |
1145 +#ifdef XP_MACOSX |
1175 + <toolbarbutton id="developer-toolbar-closebutton" |
1146 + <toolbarbutton id="developer-toolbar-closebutton" |
1182 + <label class="gclitoolbar-prompt-label">»</label> |
1153 + <label class="gclitoolbar-prompt-label">»</label> |
1183 + </hbox> |
1154 + </hbox> |
1184 + <hbox class="gclitoolbar-complete-node"/> |
1155 + <hbox class="gclitoolbar-complete-node"/> |
1185 + <textbox class="gclitoolbar-input-node" rows="1"/> |
1156 + <textbox class="gclitoolbar-input-node" rows="1"/> |
1186 + </stack> |
1157 + </stack> |
1187 + <toolbarbutton id="developer-toolbar-webconsole" |
1158 + <toolbarbutton id="developer-toolbar-toolbox-button" |
1188 + class="developer-toolbar-button" |
1159 + class="developer-toolbar-button" |
1189 + observes="devtoolsMenuBroadcaster_WebConsole"/> |
1160 + observes="devtoolsMenuBroadcaster_DevToolbox" |
1190 + <toolbarbutton id="developer-toolbar-inspector" |
1161 + tooltiptext="&devToolbarToolsButton.tooltip;"/> |
1191 + class="developer-toolbar-button" |
|
1192 + observes="devtoolsMenuBroadcaster_Inspect"/> |
|
1193 + <toolbarbutton id="developer-toolbar-styleeditor" |
|
1194 + class="developer-toolbar-button" |
|
1195 + observes="devtoolsMenuBroadcaster_StyleEditor"/> |
|
1196 + <toolbarbutton id="developer-toolbar-debugger" |
|
1197 + class="developer-toolbar-button" |
|
1198 + observes="devtoolsMenuBroadcaster_Debugger"/> |
|
1199 + <toolbarbutton id="developer-toolbar-other-tools" |
|
1200 + type="menu" |
|
1201 + class="developer-toolbar-button" |
|
1202 + label="&devToolbarOtherToolsButton.label;"> |
|
1203 + <menupopup position="before_end"> |
|
1204 + <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/> |
|
1205 + <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/> |
|
1206 + <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/> |
|
1207 + <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/> |
|
1208 + <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/> |
|
1209 + <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/> |
|
1210 + <menuitem observes="devtoolsMenuBroadcaster_PageSource"/> |
|
1211 + <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/> |
|
1212 + <menuseparator/> |
|
1213 + <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/> |
|
1214 + </menupopup> |
|
1215 + </toolbarbutton> |
|
1216 + |
|
1217 +#ifndef XP_MACOSX |
1162 +#ifndef XP_MACOSX |
1218 + <toolbarbutton id="developer-toolbar-closebutton" |
1163 + <toolbarbutton id="developer-toolbar-closebutton" |
1219 + class="devtools-closebutton" |
1164 + class="devtools-closebutton" |
1220 + oncommand="DeveloperToolbar.hide();" |
1165 + oncommand="DeveloperToolbar.hide();" |
1221 + tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
1166 + tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
1280 + |
1225 + |
1281 +</window> |
1226 +</window> |
1282 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1227 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1283 --- a/browser/base/jar.mn |
1228 --- a/browser/base/jar.mn |
1284 +++ b/browser/base/jar.mn |
1229 +++ b/browser/base/jar.mn |
1285 @@ -50,16 +50,18 @@ browser.jar: |
1230 @@ -55,16 +55,18 @@ browser.jar: |
1286 content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) |
1231 content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) |
1287 #endif |
1232 #endif |
1288 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1233 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1289 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1234 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1290 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1235 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1291 * content/browser/browser.css (content/browser.css) |
1236 * content/browser/browser.css (content/browser.css) |
1321 #include "nsIEHistoryEnumerator.h" |
1266 #include "nsIEHistoryEnumerator.h" |
1322 #endif |
1267 #endif |
1323 |
1268 |
1324 #include "rdf.h" |
1269 #include "rdf.h" |
1325 #include "nsFeedSniffer.h" |
1270 #include "nsFeedSniffer.h" |
1326 @@ -32,18 +32,16 @@ using namespace mozilla::browser; |
1271 @@ -34,18 +34,16 @@ using namespace mozilla::browser; |
1327 |
1272 |
1328 ///////////////////////////////////////////////////////////////////////////// |
1273 ///////////////////////////////////////////////////////////////////////////// |
1329 |
1274 |
1330 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1275 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1331 #if defined(XP_WIN) |
1276 #if defined(XP_WIN) |
1340 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1285 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1341 #endif |
1286 #endif |
1342 |
1287 |
1343 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1288 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1344 |
1289 |
1345 @@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
1290 @@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
|
1291 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1346 #endif |
1292 #endif |
1347 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
|
1348 |
1293 |
1349 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1294 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1350 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1295 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1351 #if defined(XP_WIN) |
1296 #if defined(XP_WIN) |
1352 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
1297 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
1385 // In Windows 8 we launch the control panel since it's the only |
1330 // In Windows 8 we launch the control panel since it's the only |
1386 // way to get all file type association prefs. So we don't know |
1331 // way to get all file type association prefs. So we don't know |
1387 // when the user will select the default. We refresh here periodically |
1332 // when the user will select the default. We refresh here periodically |
1388 // in case the default changes. On other Windows OS's defaults can also |
1333 // in case the default changes. On other Windows OS's defaults can also |
1389 // be set while the prefs are open. |
1334 // be set while the prefs are open. |
1390 @@ -715,14 +721,25 @@ var gAdvancedPane = { |
1335 @@ -791,14 +797,25 @@ var gAdvancedPane = { |
1391 * Set browser as the operating system default browser. |
1336 * Set browser as the operating system default browser. |
1392 */ |
1337 */ |
1393 setDefaultBrowser: function() |
1338 setDefaultBrowser: function() |
1394 { |
1339 { |
1395 let shellSvc = getShellService(); |
1340 let shellSvc = getShellService(); |
1847 + |
1792 + |
1848 +#endif // nsunixshellservice_h____ |
1793 +#endif // nsunixshellservice_h____ |
1849 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1794 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1850 --- a/browser/installer/package-manifest.in |
1795 --- a/browser/installer/package-manifest.in |
1851 +++ b/browser/installer/package-manifest.in |
1796 +++ b/browser/installer/package-manifest.in |
1852 @@ -578,18 +578,20 @@ |
1797 @@ -578,19 +578,21 @@ |
1853 @BINPATH@/@PREF_DIR@/healthreport-prefs.js |
|
1854 #endif |
|
1855 @BINPATH@/greprefs.js |
|
1856 @BINPATH@/defaults/autoconfig/platform.js |
|
1857 @BINPATH@/defaults/autoconfig/prefcalls.js |
1798 @BINPATH@/defaults/autoconfig/prefcalls.js |
|
1799 @BINPATH@/defaults/profile/prefs.js |
|
1800 |
1858 #ifndef LIBXUL_SDK |
1801 #ifndef LIBXUL_SDK |
1859 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1802 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
|
1803 ; Technically this is an app pref file, but we are keeping it in the original |
|
1804 ; gre location for now. |
1860 @BINPATH@/defaults/pref/channel-prefs.js |
1805 @BINPATH@/defaults/pref/channel-prefs.js |
1861 +@BINPATH@/defaults/pref/kde.js |
1806 +@BINPATH@/defaults/pref/kde.js |
1862 #else |
1807 #else |
|
1808 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
1863 @BINPATH@/@PREF_DIR@/channel-prefs.js |
1809 @BINPATH@/@PREF_DIR@/channel-prefs.js |
1864 +@BINPATH@/@PREF_DIR@/kde.js |
1810 +@BINPATH@/@PREF_DIR@/kde.js |
1865 #endif |
1811 #endif |
1866 @BINPATH@/defaults/profile/prefs.js |
|
1867 |
1812 |
1868 ; [Layout Engine Resources] |
1813 ; Services (gre) prefs |
1869 ; Style Sheets, Graphics and other Resources used by the layout engine. |
1814 #ifdef MOZ_SERVICES_AITC |
1870 @BINPATH@/res/EditorOverride.css |
1815 @BINPATH@/defaults/pref/services-aitc.js |
1871 @BINPATH@/res/contenteditable.css |
1816 #endif |
1872 @BINPATH@/res/designmode.css |
1817 #ifdef MOZ_SERVICES_NOTIFICATIONS |
|
1818 @BINPATH@/defaults/pref/services-notifications.js |