70 + |
70 + |
71 +# All JS files which are not content (only) dependent that browser.xul |
71 +# All JS files which are not content (only) dependent that browser.xul |
72 +# wishes to include *must* go into the global-scripts.inc file |
72 +# wishes to include *must* go into the global-scripts.inc file |
73 +# so that they can be shared by macBrowserOverlay.xul. |
73 +# so that they can be shared by macBrowserOverlay.xul. |
74 +#include global-scripts.inc |
74 +#include global-scripts.inc |
75 +<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/> |
|
76 + |
75 + |
77 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
76 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
78 + |
|
79 +<script type="application/javascript" src="chrome://browser/content/downloads/downloads.js"/> |
|
80 +<script type="application/javascript" src="chrome://browser/content/downloads/indicator.js"/> |
|
81 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
|
82 + |
77 + |
83 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
78 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
84 +# browser-sets.inc file for sharing with hiddenWindow.xul. |
79 +# browser-sets.inc file for sharing with hiddenWindow.xul. |
85 +#define FULL_BROWSER_WINDOW |
80 +#define FULL_BROWSER_WINDOW |
86 +#include browser-sets.inc |
81 +#include browser-sets.inc |
108 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
103 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
109 + tbattr="tabbrowser-remote" |
104 + tbattr="tabbrowser-remote" |
110 + hidden="true" |
105 + hidden="true" |
111 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
106 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
112 +#endif |
107 +#endif |
113 + <menuseparator id="context_sendTabToDevice_separator" hidden="true"/> |
108 + <menuseparator id="context_sendTabToDevice_separator"/> |
114 + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
109 + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
115 + accesskey="&sendTabToDevice.accesskey;" hidden="true"> |
110 + accesskey="&sendTabToDevice.accesskey;"> |
116 + <menupopup id="context_sendTabToDevicePopupMenu" |
111 + <menupopup id="context_sendTabToDevicePopupMenu" |
117 + onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
112 + onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
118 + </menu> |
113 + </menu> |
119 + <menuseparator/> |
114 + <menuseparator/> |
120 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
115 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
453 + <hbox pack="center"> |
448 + <hbox pack="center"> |
454 + <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/> |
449 + <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/> |
455 + </hbox> |
450 + </hbox> |
456 + </panel> |
451 + </panel> |
457 + |
452 + |
458 + <panel id="page-action-panel" |
453 +#ifdef MOZ_PHOTON_THEME |
|
454 + <panel id="pageActionPanel" |
459 + class="cui-widget-panel" |
455 + class="cui-widget-panel" |
460 + role="group" |
456 + role="group" |
461 + type="arrow" |
457 + type="arrow" |
462 + hidden="true" |
458 + hidden="true" |
463 + flip="slide" |
459 + flip="slide" |
464 + position="bottomcenter topright" |
460 + position="bottomcenter topright" |
465 + noautofocus="true"> |
461 + tabspecific="true" |
466 + <photonpanelmultiview id="page-action-multiView" |
462 + noautofocus="true" |
467 + mainViewId="page-action-mainView"> |
463 + context="pageActionPanelContextMenu" |
468 + <panelview id="page-action-mainView" |
464 + oncontextmenu="BrowserPageActions.onContextMenu(event);" |
|
465 + copyURL-title="©URLCmd.label;" |
|
466 + emailLink-title="&emailPageCmd.label;" |
|
467 + sendToDevice-title="&sendToDevice.label2;" |
|
468 + sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"> |
|
469 + <photonpanelmultiview id="pageActionPanelMultiView" |
|
470 + mainViewId="pageActionPanelMainView" |
|
471 + viewCacheId="appMenu-viewCache"> |
|
472 + <panelview id="pageActionPanelMainView" |
469 + class="PanelUI-subView"> |
473 + class="PanelUI-subView"> |
470 + <vbox class="panel-subview-body"> |
474 + <vbox class="panel-subview-body"/> |
471 + <toolbarbutton id="page-action-bookmark-button" |
|
472 + class="subviewbutton subviewbutton-iconic" |
|
473 + observes="bookmarkThisPageBroadcaster" |
|
474 + command="Browser:AddBookmarkAs" |
|
475 + onclick="gPageActionButton.panel.hidePopup();"/> |
|
476 + <toolbarseparator/> |
|
477 + <toolbarbutton id="page-action-copy-url-button" |
|
478 + class="subviewbutton subviewbutton-iconic" |
|
479 + label="©URLCmd.label;" |
|
480 + command="PageAction:copyURL"/> |
|
481 + <toolbarbutton id="page-action-email-link-button" |
|
482 + class="subviewbutton subviewbutton-iconic" |
|
483 + label="&emailPageCmd.label;" |
|
484 + command="PageAction:emailLink"/> |
|
485 + <toolbarbutton id="page-action-send-to-device-button" |
|
486 + class="subviewbutton subviewbutton-iconic subviewbutton-nav" |
|
487 + label="&sendToDevice.label;" |
|
488 + closemenu="none" |
|
489 + oncommand="gPageActionButton.showSendToDeviceView(this);"/> |
|
490 + </vbox> |
|
491 + </panelview> |
|
492 + <panelview id="page-action-sendToDeviceView" |
|
493 + class="PanelUI-subView" |
|
494 + title="&sendToDevice.viewTitle;"> |
|
495 + <vbox id="page-action-sendToDeviceView-body" class="panel-subview-body"> |
|
496 + <toolbarbutton id="page-action-sendToDevice-fxa-button" |
|
497 + class="subviewbutton subviewbutton-iconic" |
|
498 + label="&syncBrand.fxAccount.label;" |
|
499 + shortcut="&sendToDevice.fxaRequired.label;" |
|
500 + oncommand="gPageActionButton.fxaButtonClicked();"/> |
|
501 + <toolbarbutton id="page-action-no-devices-button" |
|
502 + class="subviewbutton" |
|
503 + label="&sendToDevice.noDevices.label;" |
|
504 + disabled="true"/> |
|
505 + </vbox> |
|
506 + </panelview> |
475 + </panelview> |
507 + </photonpanelmultiview> |
476 + </photonpanelmultiview> |
508 + </panel> |
477 + </panel> |
|
478 + |
|
479 + <menupopup id="pageActionPanelContextMenu" |
|
480 + onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);"> |
|
481 + <menuitem id="pageActionPanelContextMenu-toggleUrlbar" |
|
482 + add-label="&pageAction.addToUrlbar.label;" |
|
483 + remove-label="&pageAction.removeFromUrlbar.label;" |
|
484 + label="&pageAction.addToUrlbar.label;" |
|
485 + oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/> |
|
486 + </menupopup> |
|
487 +#endif |
509 + |
488 + |
510 + <!-- Bookmarks and history tooltip --> |
489 + <!-- Bookmarks and history tooltip --> |
511 + <tooltip id="bhTooltip"/> |
490 + <tooltip id="bhTooltip"/> |
512 + |
491 + |
513 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
492 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
788 + class="chromeclass-toolbar-additional"> |
767 + class="chromeclass-toolbar-additional"> |
789 + <toolbarbutton id="reload-button" |
768 + <toolbarbutton id="reload-button" |
790 + class="toolbarbutton-1" |
769 + class="toolbarbutton-1" |
791 + command="Browser:ReloadOrDuplicate" |
770 + command="Browser:ReloadOrDuplicate" |
792 + onclick="checkForMiddleClick(this, event);" |
771 + onclick="checkForMiddleClick(this, event);" |
793 + tooltip="dynamic-shortcut-tooltip"/> |
772 + tooltip="dynamic-shortcut-tooltip"> |
|
773 + <box class="toolbarbutton-animatable-box"> |
|
774 + <image class="toolbarbutton-animatable-image"/> |
|
775 + </box> |
|
776 + </toolbarbutton> |
794 + <toolbarbutton id="stop-button" |
777 + <toolbarbutton id="stop-button" |
795 + class="toolbarbutton-1" |
778 + class="toolbarbutton-1" |
796 + command="Browser:Stop" |
779 + command="Browser:Stop" |
797 + tooltip="dynamic-shortcut-tooltip"/> |
780 + tooltip="dynamic-shortcut-tooltip"> |
|
781 + <box class="toolbarbutton-animatable-box"> |
|
782 + <image class="toolbarbutton-animatable-image"/> |
|
783 + </box> |
|
784 + </toolbarbutton> |
798 + </toolbaritem> |
785 + </toolbaritem> |
799 +#endif |
786 +#endif |
800 + <hbox id="urlbar-wrapper" flex="1"> |
787 + <hbox id="urlbar-wrapper" flex="1"> |
801 +#ifndef MOZ_PHOTON_THEME |
788 +#ifndef MOZ_PHOTON_THEME |
802 + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
789 + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
816 + shrinkdelay="250" |
803 + shrinkdelay="250" |
817 + tabscrolling="true" |
804 + tabscrolling="true" |
818 + showcommentcolumn="true" |
805 + showcommentcolumn="true" |
819 + showimagecolumn="true" |
806 + showimagecolumn="true" |
820 + enablehistory="true" |
807 + enablehistory="true" |
821 + maxrows="10" |
|
822 + newlines="stripsurroundingwhitespace" |
808 + newlines="stripsurroundingwhitespace" |
823 + ontextentered="this.handleCommand(param);" |
809 + ontextentered="this.handleCommand(param);" |
824 + ontextreverted="return this.handleRevert();" |
810 + ontextreverted="return this.handleRevert();" |
825 + pageproxystate="invalid"> |
811 + pageproxystate="invalid"> |
826 + <!-- Use onclick instead of normal popup= syntax since the popup |
812 + <!-- Use onclick instead of normal popup= syntax since the popup |
852 + <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button" |
838 + <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button" |
853 + tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/> |
839 + tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/> |
854 + </box> |
840 + </box> |
855 + <box id="notification-popup-box" |
841 + <box id="notification-popup-box" |
856 + hidden="true" |
842 + hidden="true" |
857 + onmouseover="document.getElementById('identity-icon').classList.add('no-hover');" |
843 + onmouseover="document.getElementById('identity-box').classList.add('no-hover');" |
858 + onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');" |
844 + onmouseout="document.getElementById('identity-box').classList.remove('no-hover');" |
859 + align="center"> |
845 + align="center"> |
860 + <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
846 + <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
861 + tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> |
847 + tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> |
862 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
848 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
863 + tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/> |
849 + tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/> |
916 + onclick="ReaderParent.buttonClick(event);"/> |
902 + onclick="ReaderParent.buttonClick(event);"/> |
917 + <toolbarbutton id="urlbar-zoom-button" |
903 + <toolbarbutton id="urlbar-zoom-button" |
918 + onclick="FullZoom.reset();" |
904 + onclick="FullZoom.reset();" |
919 + tooltip="dynamic-shortcut-tooltip" |
905 + tooltip="dynamic-shortcut-tooltip" |
920 + hidden="true"/> |
906 + hidden="true"/> |
|
907 +#ifdef MOZ_PHOTON_THEME |
|
908 + <image id="pageActionButton" |
|
909 + class="urlbar-icon" |
|
910 + tooltiptext="&pageActionButton.tooltip;" |
|
911 + onclick="BrowserPageActions.mainButtonClicked(event);"/> |
|
912 + <hbox id="star-button-box" hidden="true"> |
|
913 + <image id="star-button" |
|
914 + class="urlbar-icon" |
|
915 + onclick="BookmarkingUI.onStarCommand(event);"> |
|
916 + <observes element="bookmarkThisPageBroadcaster" attribute="starred"/> |
|
917 + <observes element="bookmarkThisPageBroadcaster" attribute="tooltiptext"/> |
|
918 + </image> |
|
919 + <hbox id="star-button-animatable-box"> |
|
920 + <image id="star-button-animatable-image" |
|
921 + onclick="BookmarkingUI.onStarCommand(event);"/> |
|
922 + </hbox> |
|
923 + </hbox> |
|
924 +#endif |
921 + </hbox> |
925 + </hbox> |
922 + <hbox id="userContext-icons" hidden="true"> |
926 + <hbox id="userContext-icons" hidden="true"> |
923 + <label id="userContext-label"/> |
927 + <label id="userContext-label"/> |
924 + <image id="userContext-indicator"/> |
928 + <image id="userContext-indicator"/> |
925 + </hbox> |
929 + </hbox> |
972 + <menupopup id="BMB_bookmarksPopup" |
975 + <menupopup id="BMB_bookmarksPopup" |
973 + class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
976 + class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
974 + placespopup="true" |
977 + placespopup="true" |
975 + context="placesContext" |
978 + context="placesContext" |
976 + openInTabs="children" |
979 + openInTabs="children" |
977 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
980 + oncommand="BookmarksEventHandler.onCommand(event);" |
978 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
981 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
979 + onpopupshowing="BookmarkingUI.onPopupShowing(event); |
982 + onpopupshowing="BookmarkingUI.onPopupShowing(event); |
980 + BookmarkingUI.attachPlacesView(event, this);" |
983 + BookmarkingUI.attachPlacesView(event, this);" |
981 + tooltip="bhTooltip" popupsinherittooltip="true"> |
984 + tooltip="bhTooltip" popupsinherittooltip="true"> |
982 + <menuitem id="BMB_viewBookmarksSidebar" |
985 + <menuitem id="BMB_viewBookmarksSidebar" |
1081 + </hbox> |
1084 + </hbox> |
1082 + |
1085 + |
1083 + <toolbarbutton id="nav-bar-overflow-button" |
1086 + <toolbarbutton id="nav-bar-overflow-button" |
1084 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
1087 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
1085 + skipintoolbarset="true" |
1088 + skipintoolbarset="true" |
1086 + tooltiptext="&navbarOverflow.label;"/> |
1089 + tooltiptext="&navbarOverflow.label;"> |
|
1090 +#ifdef MOZ_PHOTON_ANIMATIONS |
|
1091 + <box class="toolbarbutton-animatable-box"> |
|
1092 + <image class="toolbarbutton-animatable-image"/> |
|
1093 + </box> |
|
1094 +#endif |
|
1095 + </toolbarbutton> |
1087 + |
1096 + |
1088 + <toolbaritem id="PanelUI-button" |
1097 + <toolbaritem id="PanelUI-button" |
1089 + class="chromeclass-toolbar-additional" |
1098 + class="chromeclass-toolbar-additional" |
1090 + removable="false"> |
1099 + removable="false"> |
1091 + <toolbarbutton id="PanelUI-menu-button" |
1100 + <toolbarbutton id="PanelUI-menu-button" |
1136 + oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/> |
1145 + oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/> |
1137 + <hbox flex="1" |
1146 + <hbox flex="1" |
1138 + id="PlacesToolbar" |
1147 + id="PlacesToolbar" |
1139 + context="placesContext" |
1148 + context="placesContext" |
1140 + onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
1149 + onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
1141 + oncommand="BookmarksEventHandler.onCommand(event, this._placesView);" |
1150 + oncommand="BookmarksEventHandler.onCommand(event);" |
1142 + tooltip="bhTooltip" |
1151 + tooltip="bhTooltip" |
1143 + popupsinherittooltip="true"> |
1152 + popupsinherittooltip="true"> |
1144 + <hbox flex="1"> |
1153 + <hbox flex="1"> |
1145 + <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true"> |
1154 + <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true"> |
1146 + <image id="PlacesToolbarDropIndicator" |
1155 + <image id="PlacesToolbarDropIndicator" |
1205 + type="checkbox" |
1214 + type="checkbox" |
1206 + label="&fullScreenCmd.label;" |
1215 + label="&fullScreenCmd.label;" |
1207 + tooltip="dynamic-shortcut-tooltip"/> |
1216 + tooltip="dynamic-shortcut-tooltip"/> |
1208 +#ifdef MOZ_PHOTON_THEME |
1217 +#ifdef MOZ_PHOTON_THEME |
1209 + <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1218 + <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1210 + oncommand="PanelUI.showSubView('appMenu-libraryView', this, null, true);" |
1219 + oncommand="PanelUI.showSubView('appMenu-libraryView', this, null, event);" |
1211 + label="&places.library.title;"/> |
1220 + closemenu="none" |
|
1221 + label="&places.library.title;"> |
|
1222 + <box class="toolbarbutton-animatable-box"> |
|
1223 + <image class="toolbarbutton-animatable-image"/> |
|
1224 + </box> |
|
1225 + </toolbarbutton> |
1212 +#endif |
1226 +#endif |
1213 + </toolbarpalette> |
1227 + </toolbarpalette> |
1214 + </toolbox> |
1228 + </toolbox> |
1215 + |
1229 + |
1216 + <hbox id="fullscr-toggler" hidden="true"/> |
1230 + <hbox id="fullscr-toggler" hidden="true"/> |
1395 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1409 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1396 #endif |
1410 #endif |
1397 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1411 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1398 --- a/browser/components/preferences/in-content/main.js |
1412 --- a/browser/components/preferences/in-content/main.js |
1399 +++ b/browser/components/preferences/in-content/main.js |
1413 +++ b/browser/components/preferences/in-content/main.js |
1400 @@ -39,16 +39,23 @@ var gMainPane = { |
1414 @@ -41,16 +41,23 @@ var gMainPane = { |
1401 // way to get all file type association prefs. So we don't know |
1415 // way to get all file type association prefs. So we don't know |
1402 // when the user will select the default. We refresh here periodically |
1416 // when the user will select the default. We refresh here periodically |
1403 // in case the default changes. On other Windows OS's defaults can also |
1417 // in case the default changes. On other Windows OS's defaults can also |
1404 // be set while the prefs are open. |
1418 // be set while the prefs are open. |
1405 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1419 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1419 let defaultPerformancePref = |
1433 let defaultPerformancePref = |
1420 document.getElementById("browser.preferences.defaultPerformanceSettings.enabled"); |
1434 document.getElementById("browser.preferences.defaultPerformanceSettings.enabled"); |
1421 defaultPerformancePref.addEventListener("change", () => { |
1435 defaultPerformancePref.addEventListener("change", () => { |
1422 this.updatePerformanceSettingsBox({duringChangeEvent: true}); |
1436 this.updatePerformanceSettingsBox({duringChangeEvent: true}); |
1423 }); |
1437 }); |
1424 @@ -780,16 +787,27 @@ var gMainPane = { |
1438 @@ -875,16 +882,27 @@ var gMainPane = { |
1425 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1439 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1426 alwaysCheckPref.value = true; |
1440 alwaysCheckPref.value = true; |
1427 |
1441 |
1428 let shellSvc = getShellService(); |
1442 let shellSvc = getShellService(); |
1429 if (!shellSvc) |
1443 if (!shellSvc) |
1450 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1464 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1451 } |
1465 } |
1452 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1466 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1453 --- a/browser/components/shell/moz.build |
1467 --- a/browser/components/shell/moz.build |
1454 +++ b/browser/components/shell/moz.build |
1468 +++ b/browser/components/shell/moz.build |
1455 @@ -37,16 +37,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1469 @@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1456 ] |
1470 ] |
1457 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1471 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1458 SOURCES += [ |
1472 SOURCES += [ |
1459 'nsMacShellService.cpp', |
1473 'nsMacShellService.cpp', |
1460 ] |
1474 ] |
1762 + |
1776 + |
1763 +#endif // nsunixshellservice_h____ |
1777 +#endif // nsunixshellservice_h____ |
1764 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1778 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1765 --- a/browser/installer/package-manifest.in |
1779 --- a/browser/installer/package-manifest.in |
1766 +++ b/browser/installer/package-manifest.in |
1780 +++ b/browser/installer/package-manifest.in |
1767 @@ -662,16 +662,18 @@ |
1781 @@ -664,16 +664,18 @@ |
1768 @RESPATH@/browser/defaults/blocklists |
1782 @RESPATH@/browser/defaults/blocklists |
1769 @RESPATH@/browser/defaults/pinning |
1783 @RESPATH@/browser/defaults/pinning |
1770 |
1784 |
1771 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1785 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1772 ; Technically this is an app pref file, but we are keeping it in the original |
1786 ; Technically this is an app pref file, but we are keeping it in the original |