17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?> |
20 +<?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?> |
20 +<?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?> |
23 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
23 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
24 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
24 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
25 + |
25 + |
26 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
26 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
27 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
27 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
110 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
110 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
111 + tbattr="tabbrowser-remote" |
111 + tbattr="tabbrowser-remote" |
112 + hidden="true" |
112 + hidden="true" |
113 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
113 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
114 +#endif |
114 +#endif |
|
115 + <menuseparator id="context_sendTabToDevice_separator" hidden="true"/> |
|
116 + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
|
117 + accesskey="&sendTabToDevice.accesskey;" hidden="true"> |
|
118 + <menupopup id="context_sendTabToDevicePopupMenu" |
|
119 + onpopupshowing="gFxAccounts.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
|
120 + </menu> |
115 + <menuseparator/> |
121 + <menuseparator/> |
116 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
122 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
117 + tbattr="tabbrowser-multiple-visible" |
123 + tbattr="tabbrowser-multiple-visible" |
118 + oncommand="gBrowser.reloadAllTabs();"/> |
124 + oncommand="gBrowser.reloadAllTabs();"/> |
119 + <menuitem id="context_bookmarkAllTabs" |
125 + <menuitem id="context_bookmarkAllTabs" |
378 + </menupopup> |
384 + </menupopup> |
379 + |
385 + |
380 + <menupopup id="placesContext"> |
386 + <menupopup id="placesContext"> |
381 + <menuseparator id="placesContext_recentlyBookmarkedSeparator" |
387 + <menuseparator id="placesContext_recentlyBookmarkedSeparator" |
382 + ignoreitem="true" |
388 + ignoreitem="true" |
383 + ordinal="2" |
|
384 + hidden="true"/> |
389 + hidden="true"/> |
385 + <menuitem id="placesContext_hideRecentlyBookmarked" |
390 + <menuitem id="placesContext_hideRecentlyBookmarked" |
386 + label="&hideRecentlyBookmarked.label;" |
391 + label="&hideRecentlyBookmarked.label;" |
387 + accesskey="&hideRecentlyBookmarked.accesskey;" |
392 + accesskey="&hideRecentlyBookmarked.accesskey;" |
388 + oncommand="BookmarkingUI.hideRecentlyBookmarked();" |
393 + oncommand="BookmarkingUI.hideRecentlyBookmarked();" |
389 + closemenu="single" |
394 + closemenu="single" |
390 + ignoreitem="true" |
395 + ignoreitem="true" |
391 + ordinal="2" |
|
392 + hidden="true"/> |
396 + hidden="true"/> |
393 + <menuitem id="placesContext_showRecentlyBookmarked" |
397 + <menuitem id="placesContext_showRecentlyBookmarked" |
394 + label="&showRecentlyBookmarked.label;" |
398 + label="&showRecentlyBookmarked.label;" |
395 + accesskey="&showRecentlyBookmarked.accesskey;" |
399 + accesskey="&showRecentlyBookmarked.accesskey;" |
396 + oncommand="BookmarkingUI.showRecentlyBookmarked();" |
400 + oncommand="BookmarkingUI.showRecentlyBookmarked();" |
397 + closemenu="single" |
401 + closemenu="single" |
398 + ignoreitem="true" |
402 + ignoreitem="true" |
399 + ordinal="2" |
|
400 + hidden="true"/> |
403 + hidden="true"/> |
401 + </menupopup> |
404 + </menupopup> |
402 + |
405 + |
403 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
406 + <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top"> |
404 + <hbox> |
407 + <hbox> |
405 + <button class="ctrlTab-preview" flex="1"/> |
408 + <button class="ctrlTab-preview" flex="1"/> |
406 + <button class="ctrlTab-preview" flex="1"/> |
409 + <button class="ctrlTab-preview" flex="1"/> |
407 + <button class="ctrlTab-preview" flex="1"/> |
410 + <button class="ctrlTab-preview" flex="1"/> |
408 + <button class="ctrlTab-preview" flex="1"/> |
411 + <button class="ctrlTab-preview" flex="1"/> |
551 +<vbox flex="1" id="browser-panel"> |
554 +<vbox flex="1" id="browser-panel"> |
552 + |
555 + |
553 + <toolbox id="navigator-toolbox" mode="icons"> |
556 + <toolbox id="navigator-toolbox" mode="icons"> |
554 + <!-- Menu --> |
557 + <!-- Menu --> |
555 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
558 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
556 + defaultset="menubar-items" |
|
557 + mode="icons" iconsize="small" |
559 + mode="icons" iconsize="small" |
558 +#ifdef MENUBAR_CAN_AUTOHIDE |
560 +#ifdef MENUBAR_CAN_AUTOHIDE |
559 + toolbarname="&menubarCmd.label;" |
561 + toolbarname="&menubarCmd.label;" |
560 + accesskey="&menubarCmd.accesskey;" |
562 + accesskey="&menubarCmd.accesskey;" |
561 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) |
563 +#if defined(MOZ_WIDGET_GTK) |
562 + autohide="true" |
564 + autohide="true" |
563 +#endif |
565 +#endif |
564 +#endif |
566 +#endif |
565 + context="toolbar-context-menu"> |
567 + context="toolbar-context-menu"> |
566 + <toolbaritem id="menubar-items" align="center"> |
568 + <toolbaritem id="menubar-items" align="center"> |
655 + skipintoolbarset="true"/> |
656 + skipintoolbarset="true"/> |
656 +#endif |
657 +#endif |
657 +#endif |
658 +#endif |
658 + </toolbar> |
659 + </toolbar> |
659 + |
660 + |
660 + <!-- |
|
661 + CAVEAT EMPTOR |
|
662 + Should you need to add items to the toolbar here, make sure to also add them |
|
663 + to the default placements of buttons in CustomizableUI.jsm, so the |
|
664 + customization code doesn't get confused. |
|
665 + --> |
|
666 + <toolbar id="nav-bar" |
661 + <toolbar id="nav-bar" |
667 + aria-label="&navbarCmd.label;" |
662 + aria-label="&navbarCmd.label;" |
668 + fullscreentoolbar="true" mode="icons" customizable="true" |
663 + fullscreentoolbar="true" mode="icons" customizable="true" |
669 + iconsize="small" |
664 + iconsize="small" |
670 +#ifdef MOZ_DEV_EDITION |
|
671 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" |
|
672 +#else |
|
673 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button" |
|
674 +#endif |
|
675 + customizationtarget="nav-bar-customization-target" |
665 + customizationtarget="nav-bar-customization-target" |
676 + overflowable="true" |
666 + overflowable="true" |
677 + overflowbutton="nav-bar-overflow-button" |
667 + overflowbutton="nav-bar-overflow-button" |
678 + overflowtarget="widget-overflow-list" |
668 + overflowtarget="widget-overflow-list" |
679 + overflowpanel="widget-overflow" |
669 + overflowpanel="widget-overflow" |
713 + ontextentered="this.handleCommand(param);" |
703 + ontextentered="this.handleCommand(param);" |
714 + ontextreverted="return this.handleRevert();" |
704 + ontextreverted="return this.handleRevert();" |
715 + pageproxystate="invalid" |
705 + pageproxystate="invalid" |
716 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
706 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
717 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
707 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
718 + <box id="notification-popup-box" hidden="true" align="center"> |
|
719 + <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
|
720 + aria-label="&urlbar.defaultNotificationAnchor.label;"/> |
|
721 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
|
722 + aria-label="&urlbar.geolocationNotificationAnchor.label;"/> |
|
723 + <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button" |
|
724 + aria-label="&urlbar.addonsNotificationAnchor.label;"/> |
|
725 + <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button" |
|
726 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
|
727 + <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button" |
|
728 + aria-label="&urlbar.loginFillNotificationAnchor.label;"/> |
|
729 + <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" |
|
730 + aria-label="&urlbar.passwordNotificationAnchor.label;"/> |
|
731 + <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button" |
|
732 + aria-label="&urlbar.pluginsNotificationAnchor.label;"/> |
|
733 + <image id="web-notifications-notification-icon" class="notification-anchor-icon web-notifications-icon" role="button" |
|
734 + aria-label="&urlbar.webNotsNotificationAnchor3.label;"/> |
|
735 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button" |
|
736 + aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/> |
|
737 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon camera-icon in-use" role="button" |
|
738 + aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/> |
|
739 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button" |
|
740 + aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/> |
|
741 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon microphone-icon in-use" role="button" |
|
742 + aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/> |
|
743 + <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button" |
|
744 + aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/> |
|
745 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon screen-icon in-use" role="button" |
|
746 + aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/> |
|
747 + <image id="pointerLock-notification-icon" class="notification-anchor-icon pointer-icon" role="button" |
|
748 + aria-label="&urlbar.pointerLockNotificationAnchor.label;"/> |
|
749 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button" |
|
750 + aria-label="&urlbar.servicesNotificationAnchor.label;"/> |
|
751 + <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button" |
|
752 + aria-label="&urlbar.translateNotificationAnchor.label;"/> |
|
753 + <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button" |
|
754 + aria-label="&urlbar.translatedNotificationAnchor.label;"/> |
|
755 + <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button" |
|
756 + aria-label="&urlbar.emeNotificationAnchor.label;"/> |
|
757 + </box> |
|
758 + <!-- Use onclick instead of normal popup= syntax since the popup |
708 + <!-- Use onclick instead of normal popup= syntax since the popup |
759 + code fires onmousedown, and hence eats our favicon drag events. |
709 + code fires onmousedown, and hence eats our favicon drag events. |
760 + We only add the identity-box button to the tab order when the location bar |
710 + We only add the identity-box button to the tab order when the location bar |
761 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
711 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
762 + <box id="identity-box" role="button" |
712 + <box id="identity-box" role="button" |
766 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
716 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
767 + ondragstart="gIdentityHandler.onDragStart(event);"> |
717 + ondragstart="gIdentityHandler.onDragStart(event);"> |
768 + <image id="identity-icon" |
718 + <image id="identity-icon" |
769 + consumeanchor="identity-box" |
719 + consumeanchor="identity-box" |
770 + onclick="PageProxyClickHandler(event);"/> |
720 + onclick="PageProxyClickHandler(event);"/> |
|
721 + <box id="blocked-permissions-container" align="center" tooltiptext=""> |
|
722 + <image data-permission-id="geo" class="notification-anchor-icon geo-icon blocked" role="button" |
|
723 + aria-label="&urlbar.geolocationNotificationAnchor.label;"/> |
|
724 + <image data-permission-id="desktop-notification" class="notification-anchor-icon desktop-notification-icon blocked" role="button" |
|
725 + aria-label="&urlbar.webNotsNotificationAnchor3.label;"/> |
|
726 + <image data-permission-id="camera" class="notification-anchor-icon camera-icon blocked" role="button" |
|
727 + aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/> |
|
728 + <image data-permission-id="indexedDB" class="notification-anchor-icon indexedDB-icon blocked" role="button" |
|
729 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
|
730 + <image data-permission-id="microphone" class="notification-anchor-icon microphone-icon blocked" role="button" |
|
731 + aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/> |
|
732 + <image data-permission-id="screen" class="notification-anchor-icon screen-icon blocked" role="button" |
|
733 + aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/> |
|
734 + <image data-permission-id="pointerLock" class="notification-anchor-icon pointerLock-icon blocked" role="button" |
|
735 + aria-label="&urlbar.pointerLockNotificationAnchor.label;"/> |
|
736 + </box> |
|
737 + <box id="notification-popup-box" |
|
738 + hidden="true" |
|
739 + tooltiptext="" |
|
740 + onmouseover="document.getElementById('identity-icon').classList.add('no-hover');" |
|
741 + onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');" |
|
742 + align="center"> |
|
743 + <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
|
744 + aria-label="&urlbar.defaultNotificationAnchor.label;"/> |
|
745 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
|
746 + aria-label="&urlbar.geolocationNotificationAnchor.label;"/> |
|
747 + <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button" |
|
748 + aria-label="&urlbar.addonsNotificationAnchor.label;"/> |
|
749 + <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button" |
|
750 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
|
751 + <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button" |
|
752 + aria-label="&urlbar.loginFillNotificationAnchor.label;"/> |
|
753 + <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" |
|
754 + aria-label="&urlbar.passwordNotificationAnchor.label;"/> |
|
755 + <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button" |
|
756 + aria-label="&urlbar.pluginsNotificationAnchor.label;"/> |
|
757 + <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button" |
|
758 + aria-label="&urlbar.webNotsNotificationAnchor3.label;"/> |
|
759 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button" |
|
760 + aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/> |
|
761 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon camera-icon in-use" role="button" |
|
762 + aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/> |
|
763 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button" |
|
764 + aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/> |
|
765 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon microphone-icon in-use" role="button" |
|
766 + aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/> |
|
767 + <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button" |
|
768 + aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/> |
|
769 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon screen-icon in-use" role="button" |
|
770 + aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/> |
|
771 + <image id="pointerLock-notification-icon" class="notification-anchor-icon pointerLock-icon" role="button" |
|
772 + aria-label="&urlbar.pointerLockNotificationAnchor.label;"/> |
|
773 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button" |
|
774 + aria-label="&urlbar.servicesNotificationAnchor.label;"/> |
|
775 + <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button" |
|
776 + aria-label="&urlbar.translateNotificationAnchor.label;"/> |
|
777 + <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button" |
|
778 + aria-label="&urlbar.translatedNotificationAnchor.label;"/> |
|
779 + <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button" |
|
780 + aria-label="&urlbar.emeNotificationAnchor.label;"/> |
|
781 + </box> |
771 + <image id="tracking-protection-icon"/> |
782 + <image id="tracking-protection-icon"/> |
772 + <image id="connection-icon"/> |
783 + <image id="connection-icon"/> |
773 + <hbox id="identity-icon-labels"> |
784 + <hbox id="identity-icon-labels"> |
774 + <label id="identity-icon-label" class="plain" flex="1"/> |
785 + <label id="identity-icon-label" class="plain" flex="1"/> |
775 + <label id="identity-icon-country-label" class="plain"/> |
786 + <label id="identity-icon-country-label" class="plain"/> |
1137 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1147 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1138 + </hbox> |
1148 + </hbox> |
1139 +#include ../../components/customizableui/content/customizeMode.inc.xul |
1149 +#include ../../components/customizableui/content/customizeMode.inc.xul |
1140 + </deck> |
1150 + </deck> |
1141 + |
1151 + |
1142 + <html:div id="fullscreen-warning" hidden="true"> |
1152 + <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true"> |
1143 + <html:div id="fullscreen-domain-text"> |
1153 + <html:div class="pointerlockfswarning-domain-text"> |
1144 + &fullscreenWarning.beforeDomain.label; |
1154 + &fullscreenWarning.beforeDomain.label; |
1145 + <html:span id="fullscreen-domain"/> |
1155 + <html:span class="pointerlockfswarning-domain"/> |
1146 + &fullscreenWarning.afterDomain.label; |
1156 + &fullscreenWarning.afterDomain.label; |
1147 + </html:div> |
1157 + </html:div> |
1148 + <html:div id="fullscreen-generic-text"> |
1158 + <html:div class="pointerlockfswarning-generic-text"> |
1149 + &fullscreenWarning.generic.label; |
1159 + &fullscreenWarning.generic.label; |
1150 + </html:div> |
1160 + </html:div> |
1151 + <html:button id="fullscreen-exit-button" |
1161 + <html:button id="fullscreen-exit-button" |
1152 + onclick="FullScreen.exitDomFullScreen();"> |
1162 + onclick="FullScreen.exitDomFullScreen();"> |
1153 +#ifdef XP_MACOSX |
1163 +#ifdef XP_MACOSX |
1186 + |
1207 + |
1187 +</window> |
1208 +</window> |
1188 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1209 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1189 --- a/browser/base/jar.mn |
1210 --- a/browser/base/jar.mn |
1190 +++ b/browser/base/jar.mn |
1211 +++ b/browser/base/jar.mn |
1191 @@ -69,16 +69,18 @@ browser.jar: |
1212 @@ -68,16 +68,18 @@ browser.jar: |
1192 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1213 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1193 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1214 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1194 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1215 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1195 * content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml) |
1216 * content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml) |
1196 content/browser/aboutTabGroupsMigration.js (content/aboutTabGroupsMigration.js) |
1217 content/browser/aboutTabGroupsMigration.js (content/aboutTabGroupsMigration.js) |
1203 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1224 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1204 content/browser/browser-customization.js (content/browser-customization.js) |
1225 content/browser/browser-customization.js (content/browser-customization.js) |
1205 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1226 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1206 content/browser/browser-devedition.js (content/browser-devedition.js) |
1227 content/browser/browser-devedition.js (content/browser-devedition.js) |
1207 content/browser/browser-feeds.js (content/browser-feeds.js) |
1228 content/browser/browser-feeds.js (content/browser-feeds.js) |
1208 content/browser/browser-fullScreen.js (content/browser-fullScreen.js) |
1229 content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) |
1209 content/browser/browser-fullZoom.js (content/browser-fullZoom.js) |
1230 content/browser/browser-fullZoom.js (content/browser-fullZoom.js) |
1210 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1231 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1211 --- a/browser/components/build/nsModule.cpp |
1232 --- a/browser/components/build/nsModule.cpp |
1212 +++ b/browser/components/build/nsModule.cpp |
1233 +++ b/browser/components/build/nsModule.cpp |
1213 @@ -8,17 +8,17 @@ |
1234 @@ -8,17 +8,17 @@ |
1291 // In Windows 8 we launch the control panel since it's the only |
1312 // In Windows 8 we launch the control panel since it's the only |
1292 // way to get all file type association prefs. So we don't know |
1313 // way to get all file type association prefs. So we don't know |
1293 // when the user will select the default. We refresh here periodically |
1314 // when the user will select the default. We refresh here periodically |
1294 // in case the default changes. On other Windows OS's defaults can also |
1315 // in case the default changes. On other Windows OS's defaults can also |
1295 // be set while the prefs are open. |
1316 // be set while the prefs are open. |
1296 @@ -730,16 +736,27 @@ var gMainPane = { |
1317 @@ -703,16 +709,27 @@ var gMainPane = { |
1297 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1318 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1298 alwaysCheckPref.value = true; |
1319 alwaysCheckPref.value = true; |
1299 |
1320 |
1300 let shellSvc = getShellService(); |
1321 let shellSvc = getShellService(); |
1301 if (!shellSvc) |
1322 if (!shellSvc) |
1634 + |
1655 + |
1635 +#endif // nsunixshellservice_h____ |
1656 +#endif // nsunixshellservice_h____ |
1636 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1657 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1637 --- a/browser/installer/package-manifest.in |
1658 --- a/browser/installer/package-manifest.in |
1638 +++ b/browser/installer/package-manifest.in |
1659 +++ b/browser/installer/package-manifest.in |
1639 @@ -676,16 +676,17 @@ |
1660 @@ -674,16 +674,17 @@ |
1640 @RESPATH@/greprefs.js |
1661 @RESPATH@/greprefs.js |
1641 @RESPATH@/defaults/autoconfig/prefcalls.js |
1662 @RESPATH@/defaults/autoconfig/prefcalls.js |
1642 @RESPATH@/browser/defaults/permissions |
1663 @RESPATH@/browser/defaults/permissions |
1643 |
1664 |
1644 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1665 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |