[Pale-Moon] Issue #1865 - Remove XP_MACOSX conditional blocks.

application/palemoon/app/nsBrowserApp.cpp

@@ -40,16 +40,11 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/WindowsDllBlocklist.h"
 
-#if !defined(MOZ_WIDGET_COCOA)
 #define MOZ_BROWSER_CAN_BE_CONTENTPROC
 #include "../../ipc/contentproc/plugin-container.cpp"
-#endif
 
 using namespace mozilla;
 
-#ifdef XP_MACOSX
-#define kOSXResourcesFolder "Resources"
-#endif
 #define kDesktopFolder "browser"
 
 static void Output(const char *fmt, ... )
@@ -236,9 +231,6 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
 
   nsCOMPtr<nsIFile> greDir;
   exeFile->GetParent(getter_AddRefs(greDir));
-#ifdef XP_MACOSX
-  greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
-#endif
   nsCOMPtr<nsIFile> appSubdir;
   greDir->Clone(getter_AddRefs(appSubdir));
   appSubdir->Append(NS_LITERAL_STRING(kDesktopFolder));
@@ -317,10 +309,6 @@ InitXPCOMGlue(const char *argv0, nsIFile **xreDirectory)
   if (xreDirectory) {
     // chop XPCOM_DLL off exePath
     *lastSlash = '\0';
-#ifdef XP_MACOSX
-    lastSlash = strrchr(exePath, XPCOM_FILE_PATH_SEPARATOR[0]);
-    strcpy(lastSlash + 1, kOSXResourcesFolder);
-#endif
 #ifdef XP_WIN
     rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
                          xreDirectory);
@@ -385,14 +373,5 @@ int main(int argc, char* argv[], char* envp[])
 
   NS_LogTerm();
 
-#ifdef XP_MACOSX
-  // Allow writes again. While we would like to catch writes from static
-  // destructors to allow early exits to use _exit, we know that there is
-  // at least one such write that we don't control (see bug 826029). For
-  // now we enable writes again and early exits will have to use exit instead
-  // of _exit.
-  XRE_StopLateWriteChecks();
-#endif
-
   return result;
 }

application/palemoon/app/profile/palemoon.js

@@ -16,10 +16,8 @@
 #
 
 #ifdef XP_UNIX
-#ifndef XP_MACOSX
 #define UNIX_BUT_NOT_MAC
 #endif
-#endif
 
 pref("browser.chromeURL","chrome://browser/content/");
 pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
@@ -427,13 +425,7 @@ pref("browser.link.open_newwindow.restriction", 2);
 // If true, this pref causes windows opened by window.open to be forced into new
 // tabs (rather than potentially opening separate windows, depending on
 // window.open arguments) when the browser is in fullscreen mode.
-// We set this differently on Mac because the fullscreen implementation there is
-// different.
-#ifdef XP_MACOSX
-pref("browser.link.open_newwindow.disabled_in_fullscreen", true);
-#else
 pref("browser.link.open_newwindow.disabled_in_fullscreen", false);
-#endif
 
 // Tabbed browser
 pref("browser.tabs.autoHide", false);
@@ -588,13 +580,8 @@ pref("browser.gesture.swipe.left", "Browser:BackOrBackDuplicate");
 pref("browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate");
 pref("browser.gesture.swipe.up", "cmd_scrollTop");
 pref("browser.gesture.swipe.down", "cmd_scrollBottom");
-#ifdef XP_MACOSX
-pref("browser.gesture.pinch.latched", true);
-pref("browser.gesture.pinch.threshold", 150);
-#else
 pref("browser.gesture.pinch.latched", false);
 pref("browser.gesture.pinch.threshold", 25);
-#endif
 #ifdef XP_WIN
 // Enabled for touch input display zoom.
 pref("browser.gesture.pinch.out", "cmd_fullZoomEnlarge");
@@ -622,27 +609,9 @@ pref("browser.snapshots.limit", 0);
 // 2: Go back or go forward, in your history
 // 3: Zoom in or out
 // 4: Scroll contents with X and Y swapped
-#ifdef XP_MACOSX
-// On OS X, if the wheel has one axis only, shift+wheel comes through as a
-// horizontal scroll event. Thus, we can't assign anything other than normal
-// scrolling to shift+wheel.
-pref("mousewheel.with_alt.action", 2);
-pref("mousewheel.with_shift.action", 1);
-// On MacOS X, control+wheel is typically handled by system and we don't
-// receive the event.  So, command key which is the main modifier key for
-// acceleration is the best modifier for zoom-in/out.  However, we should keep
-// the control key setting for backward compatibility.
-pref("mousewheel.with_meta.action", 3); // command key on Mac
-// Disable control-/meta-modified horizontal mousewheel events, since
-// those are used on Mac as part of modified swipe gestures (e.g.
-// Left swipe+Cmd = go back in a new tab).
-pref("mousewheel.with_control.action.override_x", 0);
-pref("mousewheel.with_meta.action.override_x", 0);
-#else
 pref("mousewheel.with_alt.action", 1);
 pref("mousewheel.with_shift.action", 2);
 pref("mousewheel.with_meta.action", 1); // win key on Win, Super/Hyper on Linux
-#endif
 pref("mousewheel.with_control.action",3);
 pref("mousewheel.with_win.action", 1);
 
@@ -709,11 +678,7 @@ pref("browser.preferences.instantApply", false);
 #else
 pref("browser.preferences.instantApply", true);
 #endif
-#ifdef XP_MACOSX
-pref("browser.preferences.animateFadeIn", true);
-#else
 pref("browser.preferences.animateFadeIn", false);
-#endif
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);
@@ -965,19 +930,9 @@ pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
 pref("signon.startup.prompt", false);
 
 // Whether to use a panel that looks like an OS X sheet for customization
-#ifdef XP_MACOSX
-pref("toolbar.customization.usesheet", true);
-#else
 pref("toolbar.customization.usesheet", false);
-#endif
 
-#ifdef XP_MACOSX
-// On mac, the default pref is per-architecture
-pref("dom.ipc.plugins.enabled.i386", true);
-pref("dom.ipc.plugins.enabled.x86_64", true);
-#else
 pref("dom.ipc.plugins.enabled", true);
-#endif
 
 pref("browser.tabs.remote", false);
 

application/palemoon/base/content/aboutDialog.js

@@ -44,12 +44,6 @@ function init(aEvent)
     document.getElementById("aboutVersion").textContent += " (" + buildDate + ")";
   }
 
-#ifdef XP_MACOSX
-  // it may not be sized at this point, and we need its width to calculate its position
-  window.sizeToContent();
-  window.moveTo((screen.availWidth / 2) - (window.outerWidth / 2), screen.availHeight / 5);
-#endif
-
 // get release notes URL from prefs
   var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
                             .getService(Components.interfaces.nsIURLFormatter);

application/palemoon/base/content/aboutDialog.xul

@@ -15,20 +15,12 @@
 %aboutDialogDTD;
 ]>
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-#endif
-
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="PMaboutDialog"
         windowtype="Browser:About"
         onload="init(event);"
-#ifdef XP_MACOSX
-        inwindowmenu="false"
-#else
         title="&aboutDialog.title;"
-#endif
         role="dialog"
         aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"
         >
@@ -83,8 +75,4 @@
   <keyset>
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
   </keyset>
-
-#ifdef XP_MACOSX
-#include browserMountPoints.inc
-#endif
 </window>

application/palemoon/base/content/autocomplete.xml

@@ -450,13 +450,8 @@
           var cancel = false;
 
           // Catch any keys that could potentially move the caret. Ctrl can be
-          // used in combination with these keys on Windows and Linux; and Alt
+          // used in combination with these keys on Windows and Linux.
-          // can be used on OS X, so make sure the unused one isn't used.
-#ifdef XP_MACOSX
-          let metaKey = aEvent.ctrlKey;
-#else
           let metaKey = aEvent.altKey;
-#endif
           if (!this.disableKeyNavigation && !metaKey) {
             switch (aEvent.keyCode) {
               case KeyEvent.DOM_VK_LEFT:
@@ -494,11 +489,6 @@
               cancel = this.mController.handleEscape();
               break;
             case KeyEvent.DOM_VK_RETURN:
-#ifdef XP_MACOSX
-              // Prevent the default action, since it will beep on Mac
-              if (aEvent.metaKey)
-                aEvent.preventDefault();
-#endif
               this.mEnterEvent = aEvent;
               if (this.mController.selection) {
                 this._selectionDetails = {
@@ -509,19 +499,9 @@
               cancel = this.handleEnter();
               break;
             case KeyEvent.DOM_VK_DELETE:
-#ifdef XP_MACOSX
-              if (!aEvent.shiftKey) {
-                break;
-              }
-#endif
               cancel = this.handleDelete();
               break;
             case KeyEvent.DOM_VK_BACK_SPACE:
-#ifdef XP_MACOSX
-              if (aEvent.shiftKey) {
-                cancel = this.handleDelete();
-              }
-#endif
               break;
             case KeyEvent.DOM_VK_DOWN:
             case KeyEvent.DOM_VK_UP:
@@ -529,9 +509,7 @@
                 this.toggleHistoryPopup();
               break;
             case KeyEvent.DOM_VK_F4:
-#ifndef XP_MACOSX
               this.toggleHistoryPopup();
-#endif
               break;
           }
 

application/palemoon/base/content/baseMenuOverlay.xul

@@ -16,22 +16,6 @@
 
 <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
-#ifdef XP_MACOSX
-<!-- nsMenuBarX hides these and uses them to build the Application menu.
-     When using Carbon widgets for Mac OS X widgets, some of these are not
-     used as they only apply to Cocoa widget builds. All version of Firefox
-     through Firefox 2 will use Carbon widgets. -->
-    <menupopup id="menu_ToolsPopup">
-        <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="openPreferences();"/>
-        <menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
-        <menuitem id="menu_mac_hide_app" label="&hideThisAppCmdMac.label;" key="key_hideThisAppCmdMac"/>
-        <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
-        <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
-    </menupopup>
-<!-- Mac window menu -->
-#include ../../../../toolkit/content/macWindowMenu.inc
-#endif
-
 #ifdef XP_WIN
     <menu id="helpMenu"
           label="&helpMenuWin.label;"
@@ -47,11 +31,7 @@
                   onclick="checkForMiddleClick(this, event);"
                   label="&productHelp.label;"
                   accesskey="&productHelp.accesskey;"
-#ifdef XP_MACOSX
-                  key="key_openHelpMac"/>
-#else
                   />
-#endif
         <menuitem id="troubleShooting"
                   accesskey="&helpTroubleshootingInfo.accesskey;"
                   label="&helpTroubleshootingInfo.label;"
@@ -89,22 +69,6 @@
     </menu>
 
     <keyset id="baseMenuKeyset">
-#ifdef XP_MACOSX
-        <key id="key_openHelpMac"
-             oncommand="openHelpLink('firefox-osxkey');"
-             key="&helpMac.commandkey;"
-             modifiers="accel"/>
-<!-- These are used to build the Application menu under Cocoa widgets -->
-        <key id="key_preferencesCmdMac"
-             key="&preferencesCmdMac.commandkey;"
-             modifiers="accel"/>
-        <key id="key_hideThisAppCmdMac"
-             key="&hideThisAppCmdMac.commandkey;"
-             modifiers="accel"/>
-        <key id="key_hideOtherAppsCmdMac"
-             key="&hideOtherAppsCmdMac.commandkey;"
-             modifiers="accel,alt"/>
-#endif
     </keyset>
 
     <stringbundleset id="stringbundleset">

application/palemoon/base/content/browser-fullScreen.js

@@ -18,12 +18,6 @@ var FullScreen = {
       fullscreenCommand.removeAttribute("checked");
     }
 
-#ifdef XP_MACOSX
-    // Make sure the menu items are adjusted.
-    document.getElementById("enterFullScreenItem").hidden = enterFS;
-    document.getElementById("exitFullScreenItem").hidden = !enterFS;
-#endif
-
     if (!this._fullScrToggler) {
       this._fullScrToggler = document.getElementById("fullscr-toggler");
       this._fullScrToggler.addEventListener("mouseover", this._expandCallback, false);
@@ -456,10 +450,5 @@ XPCOMUtils.defineLazyGetter(FullScreen, "useLionFullScreen", function() {
   // * on OS X
   // * on Lion or higher (Darwin 11+)
   // * have fullscreenbutton="true"
-#ifdef XP_MACOSX
-  return parseFloat(Services.sysinfo.getProperty("version")) >= 11 &&
-         document.documentElement.getAttribute("fullscreenbutton") == "true";
-#else
   return false;
-#endif
 });

application/palemoon/base/content/browser-menubar.inc

@@ -70,12 +70,10 @@
                           label="&printSetupCmd.label;"
                           accesskey="&printSetupCmd.accesskey;"
                           command="cmd_pageSetup"/>
-#ifndef XP_MACOSX
                 <menuitem id="menu_printPreview"
                           label="&printPreviewCmd.label;"
                           accesskey="&printPreviewCmd.accesskey;"
                           command="cmd_printPreview"/>
-#endif
                 <menuitem id="menu_print"
                           label="&printCmd.label;"
                           accesskey="&printCmd.accesskey;"
@@ -96,13 +94,9 @@
 #ifdef XP_WIN
                           label="&quitApplicationCmdWin.label;"
                           accesskey="&quitApplicationCmdWin.accesskey;"
-#else
-#ifdef XP_MACOSX
-                          label="&quitApplicationCmdMac.label;"
 #else
                           label="&quitApplicationCmd.label;"
                           accesskey="&quitApplicationCmd.accesskey;"
-#endif
 #ifdef XP_UNIX
                           key="key_quitApplication"
 #endif
@@ -215,11 +209,7 @@
                           label="&stopCmd.label;"
                           accesskey="&stopCmd.accesskey;"
                           command="Browser:Stop"
-#ifdef XP_MACOSX
-                          key="key_stop_mac"/>
-#else
                           key="key_stop"/>
-#endif
                 <menuitem id="menu_reload"
                           class="show-only-for-keyboard"
                           label="&reloadCmd.label;"
@@ -276,30 +266,12 @@
                 </menu>
 #include browser-charsetmenu.inc
                 <menuseparator/>
-#ifdef XP_MACOSX
-                <menuitem id="enterFullScreenItem"
-                          accesskey="&enterFullScreenCmd.accesskey;"
-                          label="&enterFullScreenCmd.label;"
-                          key="key_fullScreen">
-                  <observes element="View:FullScreen" attribute="oncommand"/>
-                  <observes element="View:FullScreen" attribute="disabled"/>
-                </menuitem>
-                <menuitem id="exitFullScreenItem"
-                          accesskey="&exitFullScreenCmd.accesskey;"
-                          label="&exitFullScreenCmd.label;"
-                          key="key_fullScreen"
-                          hidden="true">
-                  <observes element="View:FullScreen" attribute="oncommand"/>
-                  <observes element="View:FullScreen" attribute="disabled"/>
-                </menuitem>
-#else
                 <menuitem id="fullScreenItem"
                           accesskey="&fullScreenCmd.accesskey;"
                           label="&fullScreenCmd.label;"
                           key="key_fullScreen"
                           type="checkbox"
                           observes="View:FullScreen"/>
-#endif
                 <menuitem id="menu_showAllTabs"
                           hidden="true"
                           accesskey="&showAllTabsCmd.accesskey;"
@@ -319,9 +291,7 @@
                   label="&historyMenu.label;"
                   accesskey="&historyMenu.accesskey;">
               <menupopup id="goPopup"
-#ifndef XP_MACOSX
                          placespopup="true"
-#endif
                          context="placesContext"
                          oncommand="this.parentNode._placesView._onCommand(event);"
                          onclick="checkForMiddleClick(this, event);"
@@ -332,21 +302,13 @@
                 <menuitem id="historyMenuBack"
                           class="show-only-for-keyboard"
                           label="&backCmd.label;"
-#ifdef XP_MACOSX
-                          key="goBackKb2"
-#else
                           key="goBackKb"
-#endif
                           command="Browser:BackOrBackDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuForward"
                           class="show-only-for-keyboard"
                           label="&forwardCmd.label;"
-#ifdef XP_MACOSX
-                          key="goForwardKb2"
-#else
                           key="goForwardKb"
-#endif
                           command="Browser:ForwardOrForwardDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuHome"
@@ -359,15 +321,11 @@
                                class="show-only-for-keyboard"/>
                 <menuitem id="menu_showAllHistory"
                           label="&showAllHistoryCmd2.label;"
-#ifndef XP_MACOSX
                           class="menuitem-iconic"
                           key="showAllHistoryKb"
-#endif
                           command="Browser:ShowAllHistory"/>
                 <menuitem id="sanitizeItem"
-#ifndef XP_MACOSX
                           class="menuitem-iconic"
-#endif
                           label="&clearRecentHistory.label;"
                           key="key_sanitize"
                           command="Tools:Sanitize"/>
@@ -387,9 +345,7 @@
                       label="&historyUndoMenu.label;"
                       disabled="true">
                   <menupopup id="historyUndoPopup"
-#ifndef XP_MACOSX
                              placespopup="true"
-#endif
                              onpopupshowing="document.getElementById('history-menu')._placesView.populateUndoSubmenu();"/>
                 </menu>
                 <menu id="historyUndoWindowMenu"
@@ -397,9 +353,7 @@
                       label="&historyUndoWindowMenu.label;"
                       disabled="true">
                   <menupopup id="historyUndoWindowPopup"
-#ifndef XP_MACOSX
                              placespopup="true"
-#endif
                              onpopupshowing="document.getElementById('history-menu')._placesView.populateUndoWindowSubmenu();"/>
                 </menu>
                 <menuseparator id="startHistorySeparator"
@@ -414,9 +368,7 @@
         ondragover="PlacesMenuDNDHandler.onDragOver(event);"
         ondrop="PlacesMenuDNDHandler.onDrop(event);">
     <menupopup id="bookmarksMenuPopup"
-#ifndef XP_MACOSX
                placespopup="true"
-#endif
                context="placesContext"
                openInTabs="children"
                oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
@@ -426,32 +378,24 @@
                                  new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
                tooltip="bhTooltip" popupsinherittooltip="true">
       <menuitem id="bookmarksShowAll"
-#ifndef XP_MACOSX
                 class="menuitem-iconic"
-#endif
                 label="&organizeBookmarks.label;"
                 command="Browser:ShowAllBookmarks"
                 key="manBookmarkKb"/>
       <menuseparator id="organizeBookmarksSeparator"/>
       <menuitem id="menu_bookmarkThisPage"
-#ifndef XP_MACOSX
                 class="menuitem-iconic"
-#endif
                 label="&bookmarkThisPageCmd.label;"
                 command="Browser:AddBookmarkAs"
                 key="addBookmarkAsKb"/>
       <menuitem id="subscribeToPageMenuitem"
-#ifndef XP_MACOSX
                 class="menuitem-iconic"
-#endif
                 label="&subscribeToPageMenuitem.label;"
                 oncommand="return FeedHandler.subscribeToFeed(null, event);"
                 onclick="checkForMiddleClick(this, event);"
                 observes="singleFeedMenuitemState"/>
       <menu id="subscribeToPageMenupopup"
-#ifndef XP_MACOSX
             class="menu-iconic"
-#endif
             label="&subscribeToPageMenupopup.label;"
             observes="multipleFeedsMenuState">
         <menupopup id="subscribeToPageSubmenuMenupopup"
@@ -470,9 +414,7 @@
             label="&personalbarCmd.label;"
             container="true">
         <menupopup id="bookmarksToolbarFolderPopup"
-#ifndef XP_MACOSX
                    placespopup="true"
-#endif
                    context="placesContext"
                    onpopupshowing="if (!this.parentNode._placesView)
                                      new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
@@ -482,9 +424,7 @@
       <menuseparator builder="end"
                      class="hide-if-empty-places-result"/>
       <menuitem id="menu_unsortedBookmarks"
-#ifndef XP_MACOSX
                 class="menuitem-iconic"
-#endif
                 label="&unsortedBookmarksCmd.label;"
                 oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"/>
     </menupopup>
@@ -560,9 +500,5 @@
                         oncommand="openPreferences();"/>
               </menupopup>
             </menu>
-
-#ifdef XP_MACOSX
-          <menu id="windowMenu" />
-#endif
           <menu id="helpMenu" />
         </menubar>

application/palemoon/base/content/browser-places.js

@@ -766,11 +766,7 @@ var BookmarksEventHandler = {
    */
   onClick: function(aEvent, aView) {
     // Only handle middle-click or left-click with modifiers.
-#ifdef XP_MACOSX
-    var modifKey = aEvent.metaKey || aEvent.shiftKey;
-#else
     var modifKey = aEvent.ctrlKey || aEvent.shiftKey;
-#endif
     if (aEvent.button == 2 || (aEvent.button == 0 && !modifKey)) {
       return;
     }

application/palemoon/base/content/browser-sets.inc

@@ -4,9 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifdef XP_UNIX
-#ifndef XP_MACOSX
 #define XP_GNOME 1
-#endif
 #endif
 
   <stringbundleset id="stringbundleset">
@@ -172,10 +170,8 @@
     <key id="key_newNavigatorTab" key="&tabCmd.commandkey;" modifiers="accel" command="cmd_newNavigatorTab"/>
     <key id="focusURLBar" key="&openCmd.commandkey;" command="Browser:OpenLocation"
          modifiers="accel"/>
-#ifndef XP_MACOSX
     <key id="focusURLBar2" key="&urlbar.accesskey;" command="Browser:OpenLocation"
          modifiers="alt"/>
-#endif
 
 #
 # Search Command Key Logic works like this:
@@ -195,9 +191,6 @@
 # for people to switch to Linux.
 #
     <key id="key_search" key="&searchFocus.commandkey;" command="Tools:Search" modifiers="accel"/>
-#ifdef XP_MACOSX
-    <key id="key_search2" key="&findOnCmd.commandkey;" command="Tools:Search" modifiers="accel,alt"/>
-#endif
 #ifdef XP_WIN
     <key id="key_search2" key="&searchFocus.commandkey2;" command="Tools:Search" modifiers="accel"/>
 #endif
@@ -236,28 +229,17 @@
 
     <key keycode="VK_BACK" command="cmd_handleBackspace"/>
     <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift"/>
-#ifndef XP_MACOSX
     <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
     <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>
-#else
-    <key id="goBackKb" keycode="VK_LEFT" command="Browser:Back" modifiers="accel" />
-    <key id="goForwardKb" keycode="VK_RIGHT" command="Browser:Forward" modifiers="accel" />
-#endif
 #ifdef XP_UNIX
     <key id="goBackKb2" key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
     <key id="goForwardKb2" key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
 #endif
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
     <key keycode="VK_F5" command="Browser:Reload"/>
-#ifndef XP_MACOSX
     <key id="showAllHistoryKb" key="&showAllHistoryCmd.commandkey;" command="Browser:ShowAllHistory" modifiers="accel,shift"/>
     <key keycode="VK_F5" command="Browser:ReloadSkipCache" modifiers="accel"/>
     <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
-#else
-    <key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,control"/>
-    <key id="key_fullScreen_old" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>
-    <key keycode="VK_F11" command="View:FullScreen"/>
-#endif
     <key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>
     <key key="&reloadCmd.commandkey;" command="Browser:ReloadSkipCache" modifiers="accel,shift"/>
     <key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
@@ -290,18 +272,10 @@
 # networking requests, XHR, animated gifs, etc.
     <key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
     <key id="key_stop_all" keycode="VK_ESCAPE" modifiers="shift" oncommand="BrowserStop();"/>
-#ifdef XP_MACOSX
-    <key id="key_stop_mac" modifiers="accel" key="&stopCmd.macCommandKey;" command="Browser:Stop"/>
-    <key id="key_stop_all_mac" modifiers="accel,shift" key="&stopCmd.macCommandKey;" oncommand="BrowserStop();"/>
-#endif
 
     <key id="key_gotoHistory"
          key="&historySidebarCmd.commandKey;"
-#ifdef XP_MACOSX
-         modifiers="accel,shift"
-#else
          modifiers="accel"
-#endif
          command="viewHistorySidebar"/>
 
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
@@ -318,9 +292,6 @@
 
     <key id="key_privatebrowsing" command="Tools:PrivateBrowsing" key="&privateBrowsingCmd.commandkey;" modifiers="accel,shift"/>
     <key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
-#ifdef XP_MACOSX
-    <key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/>
-#endif
 #ifdef XP_UNIX
     <key id="key_quitApplication" key="&quitApplicationCmdUnix.key;" command="cmd_quitApplication" modifiers="accel"/>
 #endif
@@ -351,7 +322,4 @@
   </keyset>
 
 # Used by baseMenuOverlay
-#ifdef XP_MACOSX
-  <commandset id="baseMenuCommandSet" />
-#endif
   <keyset id="baseMenuKeyset" />

application/palemoon/base/content/browser-tabPreviews.js

@@ -991,9 +991,6 @@ var allTabs = {
       let container = this.container.getBoundingClientRect();
       let tabCloseButton = this.tabCloseButton.getBoundingClientRect();
       let alignLeft = getComputedStyle(this.panel, "").direction == "rtl";
-#ifdef XP_MACOSX
-      alignLeft = !alignLeft;
-#endif
       this.tabCloseButton.left = canvas.left -
                                  container.left +
                                  parseInt(this.container.left) +

application/palemoon/base/content/browser-tabPreviews.xml

@@ -28,10 +28,6 @@
       <handler event="mouseover" action="ctrlTab._mouseOverFocus(this);"/>
       <handler event="command" action="ctrlTab.pick(this);"/>
       <handler event="click" button="1" action="ctrlTab.remove(this);"/>
-#ifdef XP_MACOSX
-# Control+click is a right click on OS X
-      <handler event="click" button="2" action="ctrlTab.pick(this);"/>
-#endif
     </handlers>
   </binding>
 

application/palemoon/base/content/browser.css

@@ -179,12 +179,6 @@ toolbar[mode="icons"] > #reload-button[displaystop] {
   background-position: top right;
 }
 
-%ifdef XP_MACOSX
-#main-window[inFullscreen="true"] {
-  padding-top: 0; /* override drawintitlebar="true" */
-}
-%endif
-
 #browser-bottombox[lwthemefooter="true"] {
   background-repeat: no-repeat;
   background-position: bottom left;
@@ -553,11 +547,7 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(#nav-bar):not(
 .ctrlTab-favicon-container,
 .allTabs-favicon-container {
   -moz-box-align: start;
-%ifdef XP_MACOSX
-  -moz-box-pack: end;
-%else
   -moz-box-pack: start;
-%endif
 }
 
 .ctrlTab-favicon,

application/palemoon/base/content/browser.js

@@ -27,10 +27,7 @@ var gInPrintPreviewMode = false;
 var gContextMenu = null; // nsContextMenu instance
 var gMultiProcessBrowser = false;
 
-#ifndef XP_MACOSX
 var gEditUIVisible = true;
-#endif
-
 [
   ["gBrowser",            "content"],
   ["gNavToolbox",         "navigator-toolbox"],
@@ -1206,12 +1203,10 @@ var gBrowserInit = {
     // unless there are downloads to be displayed.
     DownloadsButton.initializeIndicator();
 
-#ifndef XP_MACOSX
     updateEditUIVisibility();
     let placesContext = document.getElementById("placesContext");
     placesContext.addEventListener("popupshowing", updateEditUIVisibility, false);
     placesContext.addEventListener("popuphiding", updateEditUIVisibility, false);
-#endif
 
 #ifdef MOZ_PERSONAS
     gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true);
@@ -1457,95 +1452,6 @@ var gBrowserInit = {
     window.QueryInterface(Ci.nsIDOMChromeWindow).browserDOMWindow = null;
   },
 
-#ifdef XP_MACOSX
-  // nonBrowserWindowStartup(), nonBrowserWindowDelayedStartup(), and
-  // nonBrowserWindowShutdown() are used for non-browser windows in
-  // macBrowserOverlay
-  nonBrowserWindowStartup: function() {
-    // Disable inappropriate commands / submenus
-    var disabledItems = ['Browser:SavePage',
-                         'Browser:SendLink', 'cmd_pageSetup', 'cmd_print', 'cmd_find', 'cmd_findAgain',
-                         'viewToolbarsMenu', 'viewSidebarMenuMenu', 'Browser:Reload',
-                         'viewFullZoomMenu', 'pageStyleMenu', 'charsetMenu', 'View:PageSource', 'View:FullScreen',
-                         'viewHistorySidebar', 'Browser:AddBookmarkAs', 'Browser:BookmarkAllTabs',
-                         'View:PageInfo', 'Browser:ToggleAddonBar'];
-    var element;
-
-    for (let disabledItem of disabledItems) {
-      element = document.getElementById(disabledItem);
-      if (element) {
-        element.setAttribute("disabled", "true");
-      }
-    }
-
-    // If no windows are active (i.e. we're the hidden window), disable the close, minimize
-    // and zoom menu commands as well
-    if (window.location.href == "chrome://browser/content/hiddenWindow.xul") {
-      var hiddenWindowDisabledItems = ['cmd_close', 'minimizeWindow', 'zoomWindow'];
-      for (let hiddenWindowDisabledItem of hiddenWindowDisabledItems) {
-        element = document.getElementById(hiddenWindowDisabledItem);
-        if (element) {
-          element.setAttribute("disabled", "true");
-        }
-      }
-
-      // also hide the window-list separator
-      element = document.getElementById("sep-window-list");
-      element.setAttribute("hidden", "true");
-
-      // Setup the dock menu.
-      let dockMenuElement = document.getElementById("menu_mac_dockmenu");
-      if (dockMenuElement != null) {
-        let nativeMenu = Cc["@mozilla.org/widget/standalonenativemenu;1"]
-                           .createInstance(Ci.nsIStandaloneNativeMenu);
-
-        try {
-          nativeMenu.init(dockMenuElement);
-
-          let dockSupport = Cc["@mozilla.org/widget/macdocksupport;1"]
-                              .getService(Ci.nsIMacDockSupport);
-          dockSupport.dockMenu = nativeMenu;
-        } catch(e) {}
-      }
-    }
-
-    if (PrivateBrowsingUtils.permanentPrivateBrowsing) {
-      document.getElementById("macDockMenuNewWindow").hidden = true;
-    }
-
-    this._delayedStartupTimeoutId = setTimeout(this.nonBrowserWindowDelayedStartup.bind(this), 0);
-  },
-
-  nonBrowserWindowDelayedStartup: function() {
-    this._delayedStartupTimeoutId = null;
-
-    // initialise the offline listener
-    BrowserOffline.init();
-
-    // Set up Sanitize Item
-    this._initializeSanitizer();
-
-    // initialize the private browsing UI
-    gPrivateBrowsingUI.init();
-
-#ifdef MOZ_SERVICES_SYNC
-    // initialize the sync UI
-    gSyncUI.init();
-#endif
-  },
-
-  nonBrowserWindowShutdown: function() {
-    // If nonBrowserWindowDelayedStartup hasn't run yet, we have no work to do -
-    // just cancel the pending timeout and return;
-    if (this._delayedStartupTimeoutId) {
-      clearTimeout(this._delayedStartupTimeoutId);
-      return;
-    }
-
-    BrowserOffline.uninit();
-  },
-#endif
-
   _initializeSanitizer: function() {
     const kDidSanitizeDomain = "privacy.sanitize.didShutdownSanitize";
     if (gPrefService.prefHasUserValue(kDidSanitizeDomain)) {
@@ -1597,11 +1503,6 @@ var gBrowserInit = {
 /* Legacy global init functions */
 var BrowserStartup        = gBrowserInit.onLoad.bind(gBrowserInit);
 var BrowserShutdown       = gBrowserInit.onUnload.bind(gBrowserInit);
-#ifdef XP_MACOSX
-var nonBrowserWindowStartup        = gBrowserInit.nonBrowserWindowStartup.bind(gBrowserInit);
-var nonBrowserWindowDelayedStartup = gBrowserInit.nonBrowserWindowDelayedStartup.bind(gBrowserInit);
-var nonBrowserWindowShutdown       = gBrowserInit.nonBrowserWindowShutdown.bind(gBrowserInit);
-#endif
 
 function HandleAppCommandEvent(evt) {
   switch (evt.command) {
@@ -1738,11 +1639,7 @@ function BrowserStop() {
 
 function BrowserReloadOrDuplicate(aEvent) {
   var backgroundTabModifier = aEvent.button == 1 ||
-#ifdef XP_MACOSX
-    aEvent.metaKey;
-#else
     aEvent.ctrlKey;
-#endif
   if (aEvent.shiftKey && !backgroundTabModifier) {
     BrowserReloadSkipCache();
     return;
@@ -1801,13 +1698,6 @@ function BrowserGoHome(aEvent) {
 }
 
 function loadOneOrMoreURIs(aURIString) {
-#ifdef XP_MACOSX
-  // we're not a browser window, pass the URI string to a new browser window
-  if (window.location.href != getBrowserURL()) {
-    window.openDialog(getBrowserURL(), "_blank", "all,dialog=no", aURIString);
-    return;
-  }
-#endif
   // This function throws for certain malformed URIs, so use exception handling
   // so that we don't disrupt startup
   try {
@@ -1834,22 +1724,6 @@ function openLocation() {
     return;
   }
 
-#ifdef XP_MACOSX
-  if (window.location.href != getBrowserURL()) {
-    var win = getTopWin();
-    if (win) {
-      // If there's an open browser window, it should handle this command
-      win.focus()
-      win.openLocation();
-    } else {
-      // If there are no open browser windows, open a new one
-      win = window.openDialog("chrome://browser/content/", "_blank",
-                              "chrome,all,dialog=no", BROWSER_NEW_TAB_URL);
-      win.addEventListener("load", openLocationCallback, false);
-    }
-    return;
-  }
-#endif
   openDialog("chrome://browser/content/openLocation.xul", "_blank",
              "chrome,modal,titlebar", window);
 }
@@ -1948,14 +1822,6 @@ function BrowserOpenFileWindow() {
 }
 
 function BrowserCloseTabOrWindow() {
-#ifdef XP_MACOSX
-  // If we're not a browser window, just close the window
-  if (window.location.href != getBrowserURL()) {
-    closeWindow(true);
-    return;
-  }
-#endif
-
   // If the current tab is the last one, this will close the window.
   gBrowser.removeCurrentTab({animate: true});
 }
@@ -3126,28 +2992,6 @@ const BrowserSearch = {
    * or focuses an existing window, if necessary.
    */
   webSearch: function() {
-#ifdef XP_MACOSX
-    if (window.location.href != getBrowserURL()) {
-      var win = getTopWin();
-      if (win) {
-        // If there's an open browser window, it should handle this command
-        win.focus();
-        win.BrowserSearch.webSearch();
-      } else {
-        // If there are no open browser windows, open a new one
-        var observer = function observer(subject, topic, data) {
-          if (subject == win) {
-            BrowserSearch.webSearch();
-            Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
-          }
-        }
-        win = window.openDialog(getBrowserURL(), "_blank",
-                                "chrome,all,dialog=no", "about:blank");
-        Services.obs.addObserver(observer, "browser-delayed-startup-finished", false);
-      }
-      return;
-    }
-#endif
     var searchBar = this.searchBar;
     if (searchBar && window.fullScreen) {
       FullScreen.showNavToolbox();
@@ -3469,9 +3313,7 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
     gIdentityHandler._cacheElements();
     window.XULBrowserWindow.init();
 
-#ifndef XP_MACOSX
     updateEditUIVisibility();
-#endif
 
     // Hacky: update the PopupNotifications' object's reference to the iconBox,
     // if it already exists, since it may have changed if the URL bar was
@@ -3576,7 +3418,6 @@ function retrieveToolbarIconsizesFromTheme() {
  * is a no op.
  */
 function updateEditUIVisibility() {
-#ifndef XP_MACOSX
   let editMenuPopupState = document.getElementById("menu_EditPopup").state;
   let contextMenuPopupState = document.getElementById("contentAreaContextMenu").state;
   let placesContextMenuPopupState = document.getElementById("placesContext").state;
@@ -3618,7 +3459,6 @@ function updateEditUIVisibility() {
     goSetCommandEnabled("cmd_delete", true);
     goSetCommandEnabled("cmd_switchTextDirection", true);
   }
-#endif
 }
 
 /**
@@ -6268,14 +6108,7 @@ function warnAboutClosingWindow() {
 
   os.notifyObservers(null, "browser-lastwindow-close-granted", null);
 
-#ifdef XP_MACOSX
-  // OS X doesn't quit the application when the last window is closed, but keeps
-  // the session alive. Hence don't prompt users to save tabs, but warn about
-  // closing multiple tabs.
-  return isPBWindow || gBrowser.warnAboutClosingTabs(gBrowser.closingTabsEnum.ALL);
-#else
   return true;
-#endif
 }
 
 var MailIntegration = {
@@ -7082,12 +6915,6 @@ var gPrivateBrowsingUI = {
     document.getElementById("Tools:Sanitize").setAttribute("disabled", "true");
 
     if (window.location.href == getBrowserURL()) {
-#if defined(XP_MACOSX) && defined(MOZ_CAN_DRAW_IN_TITLEBAR)
-      if (!PrivateBrowsingUtils.permanentPrivateBrowsing) {
-        document.documentElement.setAttribute("drawintitlebar", true);
-      }
-#endif
-
       // Adjust the window's title
       let docElement = document.documentElement;
       if (!PrivateBrowsingUtils.permanentPrivateBrowsing) {
@@ -7558,9 +7385,6 @@ var ToolbarIconColor = {
     }
 
     let toolbarSelector = "toolbar:not([collapsed=true])";
-#ifdef XP_MACOSX
-    toolbarSelector += ":not([type=menubar])";
-#endif
 
     // The getComputedStyle calls and setting the brighttext are separated in
     // two loops to avoid flushing layout and making it dirty repeatedly.

application/palemoon/base/content/browser.xul

@@ -40,18 +40,10 @@
         onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
         title="&mainWindow.title;"
         title_normal="&mainWindow.title;"
-#ifdef XP_MACOSX
-        title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
-        titledefault="&mainWindow.title;"
-        titlemodifier=""
-        titlemodifier_normal=""
-        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
-#else
         title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
         titlemodifier="&mainWindow.titlemodifier;"
         titlemodifier_normal="&mainWindow.titlemodifier;"
         titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
-#endif
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 #ifdef MOZ_PERSONAS
         lightweightthemes="true"
@@ -302,20 +294,12 @@
 
     <tooltip id="back-button-tooltip">
       <label class="tooltip-label" value="&backButton.tooltip;"/>
-#ifdef XP_MACOSX
-      <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
-#else
       <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
-#endif
     </tooltip>
 
     <tooltip id="forward-button-tooltip">
       <label class="tooltip-label" value="&forwardButton.tooltip;"/>
-#ifdef XP_MACOSX
-      <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
-#else
       <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
-#endif
     </tooltip>
 
 #include popup-notifications.inc
@@ -336,9 +320,7 @@
       </button>
     </hbox>
 #endif
-#ifndef XP_MACOSX
     <spacer id="titlebar-spacer" flex="1"/>
-#endif
     <hbox id="titlebar-buttonbox-container" align="start">
       <hbox id="titlebar-buttonbox">
         <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
@@ -581,32 +563,24 @@
                     label="&viewBookmarksToolbar.label;"/>
           <menuseparator/>
           <menuitem id="BMB_bookmarksShowAll"
-#ifndef XP_MACOSX
                     class="menuitem-iconic"
-#endif
                     label="&organizeBookmarks.label;"
                     command="Browser:ShowAllBookmarks"
                     key="manBookmarkKb"/>
           <menuseparator/>
           <menuitem id="BMB_bookmarkThisPage"
-#ifndef XP_MACOSX
                     class="menuitem-iconic"
-#endif
                     label="&bookmarkThisPageCmd.label;"
                     command="Browser:AddBookmarkAs"
                     key="addBookmarkAsKb"/>
           <menuitem id="BMB_subscribeToPageMenuitem"
-#ifndef XP_MACOSX
                     class="menuitem-iconic"
-#endif
                     label="&subscribeToPageMenuitem.label;"
                     oncommand="return FeedHandler.subscribeToFeed(null, event);"
                     onclick="checkForMiddleClick(this, event);"
                     observes="singleFeedMenuitemState"/>
           <menu id="BMB_subscribeToPageMenupopup"
-#ifndef XP_MACOSX
                 class="menu-iconic"
-#endif
                 label="&subscribeToPageMenupopup.label;"
                 observes="multipleFeedsMenuState">
             <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
@@ -658,15 +632,11 @@
                    popupsinherittooltip="true">
           <menuitem id="HMB_showAllHistory"
                     label="&showAllHistoryCmd2.label;"
-#ifndef XP_MACOSX
                     class="menuitem-iconic"
                     key="showAllHistoryKb"
-#endif
                     command="Browser:ShowAllHistory"/>
           <menuitem id="HMB_sanitizeItem"
-#ifndef XP_MACOSX
                     class="menuitem-iconic"
-#endif
                     label="&clearRecentHistory.label;"
                     key="key_sanitize"
                     command="Tools:Sanitize"/>
@@ -1012,28 +982,6 @@
     </svg:clipPath>
   </svg:svg>
 #endif
-#ifdef XP_MACOSX
-  <svg:svg height="0">
-    <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
-      <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
-    </svg:clipPath>
-  </svg:svg>
-#endif
 
 </vbox>
 # <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.

application/palemoon/base/content/hiddenWindow.xul

@@ -5,15 +5,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-
-<window id="main-window"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-#include browserMountPoints.inc
-
-</window>
-
-#endif

application/palemoon/base/content/nsContextMenu.js

@@ -986,26 +986,10 @@ nsContextMenu.prototype = {
 
     // Confirm since it's annoying if you hit this accidentally.
     const kDesktopBackgroundURL = "chrome://browser/content/setDesktopBackground.xul";
-#ifdef XP_MACOSX
+    // The Set Wallpaper dialog is modal.
-    // On Mac, the Set Desktop Background window is not modal.
-    // Don't open more than one Set Desktop Background window.
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    var dbWin = wm.getMostRecentWindow("Shell:SetDesktopBackground");
-    if (dbWin) {
-      dbWin.gSetBackground.init(this.target);
-      dbWin.focus();
-    } else {
-      openDialog(kDesktopBackgroundURL, "",
-                 "centerscreen,chrome,dialog=no,dependent,resizable=no",
-                 this.target);
-    }
-#else
-    // On non-Mac platforms, the Set Wallpaper dialog is modal.
     openDialog(kDesktopBackgroundURL, "",
                "centerscreen,chrome,dialog,modal,dependent",
                this.target);
-#endif
   },
 
   // Save URL of clicked-on frame.

application/palemoon/base/content/sanitize.js

@@ -476,11 +476,7 @@ Sanitizer.__defineGetter__("prefs", function() {
 Sanitizer.showUI = function(aParentWindow) {
   var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                      .getService(Components.interfaces.nsIWindowWatcher);
-#ifdef XP_MACOSX
-  ww.openWindow(null, // make this an app-modal window on Mac
-#else
   ww.openWindow(aParentWindow,
-#endif
                 "chrome://browser/content/sanitize.xul",
                 "Sanitize",
                 "chrome,titlebar,dialog,centerscreen,modal",

application/palemoon/base/content/tabbrowser.xml

@@ -113,11 +113,7 @@
         new Map();
       </field>
       <field name="arrowKeysShouldWrap" readonly="true">
-#ifdef XP_MACOSX
-        true
-#else
         false
-#endif
       </field>
 
       <field name="_autoScrollPopup">
@@ -3143,22 +3139,6 @@
             }
           }
 
-#ifdef XP_MACOSX
-          if (!aEvent.metaKey)
-            return;
-
-          var offset = 1;
-          switch (aEvent.charCode) {
-            case '}'.charCodeAt(0):
-              offset = -1;
-            case '{'.charCodeAt(0):
-              if (window.getComputedStyle(this, null).direction == "ltr")
-                offset *= -1;
-              this.tabContainer.advanceSelectedTab(offset, true);
-              aEvent.stopPropagation();
-              aEvent.preventDefault();
-          }
-#else
           if (aEvent.ctrlKey && !aEvent.shiftKey && !aEvent.metaKey &&
               aEvent.keyCode == KeyEvent.DOM_VK_F4 &&
               !this.mCurrentTab.pinned) {
@@ -3166,7 +3146,6 @@
             aEvent.stopPropagation();
             aEvent.preventDefault();
           }
-#endif
         ]]></body>
       </method>
 
@@ -3603,9 +3582,7 @@
       </xul:hbox>
       <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1"
                           style="min-width: 1px;"
-#ifndef XP_MACOSX
                           clicktoscroll="true"
-#endif
                           class="tabbrowser-arrowscrollbox">
 # This is a hack to circumvent bug 472020, otherwise the tabs show up on the
 # right of the newtab button.
@@ -4291,11 +4268,7 @@
                   PrivateBrowsingUtils.isWindowPrivate(sourceNode.ownerDocument.defaultView))
                 return dt.effectAllowed = "none";
 
-#ifdef XP_MACOSX
-              return dt.effectAllowed = event.altKey ? "copy" : "move";
-#else
               return dt.effectAllowed = event.ctrlKey ? "copy" : "move";
-#endif
             }
           }
 
@@ -4453,14 +4426,12 @@
       ]]></handler>
 
       <handler event="dblclick"><![CDATA[
-#ifndef XP_MACOSX
         // When the tabbar has an unified appearance with the titlebar
         // and menubar, a double-click in it should have the same behavior
         // as double-clicking the titlebar
         if (TabsInTitlebar.enabled ||
             (TabsOnTop.enabled && this.parentNode._dragBindingAlive))
           return;
-#endif
 
         if (event.button != 0 ||
             event.originalTarget.localName != "box")
@@ -4550,11 +4521,7 @@
 
       <handler event="keypress"><![CDATA[
         if (event.altKey || event.shiftKey ||
-#ifdef XP_MACOSX
-            !event.metaKey)
-#else
             !event.ctrlKey || event.metaKey)
-#endif
           return;
 
         switch (event.keyCode) {

application/palemoon/base/content/urlbarBindings.xml

@@ -375,11 +375,7 @@
           // and only if we get a keyboard event, to match user expectations.
           if (/^\s*[^.:\/\s]+(?:\/.*|\s*)$/i.test(url) &&
               (aTriggeringEvent instanceof KeyEvent)) {
-#ifdef XP_MACOSX
-            let accel = aTriggeringEvent.metaKey;
-#else
             let accel = aTriggeringEvent.ctrlKey;
-#endif
             let shift = aTriggeringEvent.shiftKey;
 
             let suffix = "";

application/palemoon/base/content/utilityOverlay.js

@@ -157,11 +157,7 @@ function whereToOpenLink(e, ignoreButton, ignoreAlt) {
 
   // Don't do anything special with right-mouse clicks.  They're probably clicks on context menu items.
 
-#ifdef XP_MACOSX
-  if (meta || (middle && middleUsesTabs)) {
-#else
   if (ctrl || (middle && middleUsesTabs)) {
-#endif
     return shift ? "tabshifted" : "tab";
   }
 
@@ -654,7 +650,6 @@ function buildHelpMenu() {
     }
   }
 #else
-#ifndef XP_MACOSX
   // Some extensions may rely on these being present so only hide the about
   // separator when there are no elements besides the check for updates menuitem
   // in between the about separator and the updates separator.
@@ -666,7 +661,6 @@ function buildHelpMenu() {
     updatesSeparator.hidden = true;
   }
 #endif
-#endif
 }
 
 
@@ -681,8 +675,6 @@ function openAboutDialog() {
 
 #ifdef XP_WIN
   var features = "chrome,centerscreen,dependent";
-#elifdef XP_MACOSX
-  var features = "chrome,resizable=no,minimizable=no";
 #else
   var features = "chrome,centerscreen,dependent,dialog=no";
 #endif

application/palemoon/base/content/viewSourceOverlay.xul

@@ -16,10 +16,6 @@
 </window>
 
 <menubar id="viewSource-main-menubar">
-#ifdef XP_MACOSX
-  <menu id="windowMenu"/>
-  <menupopup id="menu_ToolsPopup"/>
-#endif
   <menu id="helpMenu"/>
 </menubar>
 

application/palemoon/base/jar.mn

@@ -3,11 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 browser.jar:
 % content browser %content/browser/ contentaccessible=yes
-#ifdef XP_MACOSX
-% overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul
-% overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
-% overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
-#endif
 #ifdef XP_WIN
 % overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6
 #endif
@@ -66,12 +61,6 @@ browser.jar:
 * content/browser/nsContextMenu.js              (content/nsContextMenu.js)
 # XXX: We should exclude this one as well (bug 71895)
 * content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
-#ifdef XP_MACOSX
-* content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
-* content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
-* content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
-* content/browser/softwareUpdateOverlay.xul     (content/softwareUpdateOverlay.xul)
-#endif
 * content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
 #ifdef XP_WIN
   content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)

application/palemoon/components/build/nsModule.cpp

@@ -10,8 +10,6 @@
 
 #if defined(XP_WIN)
 #include "nsWindowsShellService.h"
-#elif defined(XP_MACOSX)
-#include "nsMacShellService.h"
 #elif defined(MOZ_WIDGET_GTK)
 #include "nsGNOMEShellService.h"
 #endif
@@ -28,8 +26,6 @@ using namespace mozilla::browser;
 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 #if defined(XP_WIN)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
-#elif defined(XP_MACOSX)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
 #elif defined(MOZ_WIDGET_GTK)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
 #endif
@@ -43,9 +39,6 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 #endif
 NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID);
-#ifdef XP_MACOSX
-NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
-#endif
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
@@ -55,9 +48,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
 #endif
     { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor },
-#ifdef XP_MACOSX
-    { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
-#endif
     { nullptr }
 };
 
@@ -69,9 +59,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
     { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
 #endif
     { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID },
-#ifdef XP_MACOSX
-    { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
-#endif
     { nullptr }
 };
 

application/palemoon/components/downloads/content/allDownloadsViewOverlay.xul

@@ -92,13 +92,8 @@
               accesskey="&cmd.removeFromHistory.accesskey;"/>
     <menuitem command="downloadsCmd_show"
               class="downloadShowMenuItem"
-#ifdef XP_MACOSX
-              label="&cmd.showMac.label;"
-              accesskey="&cmd.showMac.accesskey;"
-#else
               label="&cmd.show.label;"
               accesskey="&cmd.show.accesskey;"
-#endif
               />
 
     <menuseparator class="downloadCommandsSeparator"/>

application/palemoon/components/downloads/content/contentAreaDownloadsView.xul

@@ -30,9 +30,6 @@
   <commandset id="editMenuCommands"/>
 
   <keyset id="editMenuKeys">
-#ifdef XP_MACOSX
-    <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
-#endif
   </keyset>
 
   <stack flex="1">

application/palemoon/components/downloads/content/download.xml

@@ -53,11 +53,7 @@
                     tooltiptext="&cmd.retry.label;"
                     oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_retry');"/>
         <xul:button class="downloadButton downloadShow"
-#ifdef XP_MACOSX
-                    tooltiptext="&cmd.showMac.label;"
-#else
                     tooltiptext="&cmd.show.label;"
-#endif
                     oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_show');"/>
       </xul:stack>
     </content>
@@ -136,11 +132,7 @@
                   tooltiptext="&cmd.retry.label;"
                   oncommand="goDoCommand('downloadsCmd_retry')"/>
       <xul:button class="downloadButton downloadShow"
-#ifdef XP_MACOSX
-                  tooltiptext="&cmd.showMac.label;"
-#else
                   tooltiptext="&cmd.show.label;"
-#endif
                   oncommand="goDoCommand('downloadsCmd_show')"/>
 
     </content>

application/palemoon/components/downloads/content/downloads.js

@@ -475,11 +475,7 @@ const DownloadsPanel = {
     }
 
     let pasting = aEvent.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_V &&
-#ifdef XP_MACOSX
-                  aEvent.metaKey;
-#else
                   aEvent.ctrlKey;
-#endif
 
     if (!pasting) {
       return;

application/palemoon/components/downloads/content/downloadsOverlay.xul

@@ -71,13 +71,8 @@
                   accesskey="&cmd.removeFromHistory.accesskey;"/>
         <menuitem command="downloadsCmd_show"
                   class="downloadShowMenuItem"
-#ifdef XP_MACOSX
-                  label="&cmd.showMac.label;"
-                  accesskey="&cmd.showMac.accesskey;"
-#else
                   label="&cmd.show.label;"
                   accesskey="&cmd.show.accesskey;"
-#endif
                   />
 
         <menuseparator class="downloadCommandsSeparator"/>

application/palemoon/components/feeds/FeedWriter.js

@@ -675,13 +675,6 @@ FeedWriter.prototype = {
         return file.getVersionInfoField("FileDescription");
       } catch (e) {}
     }
-#endif
-#ifdef XP_MACOSX
-    if (file instanceof Ci.nsILocalFileMac) {
-      try {
-        return file.bundleDisplayName;
-      } catch (e) {}
-    }
 #endif
     return file.leafName;
   },
@@ -733,11 +726,7 @@ FeedWriter.prototype = {
 #ifdef XP_WIN
 #expand             if (fp.file.leafName != "__MOZ_APP_NAME__.exe") {
 #else
-#ifdef XP_MACOSX
-#expand             if (fp.file.leafName != "__MOZ_MACBUNDLE_NAME__") {
-#else
 #expand             if (fp.file.leafName != "__MOZ_APP_NAME__-bin") {
-#endif
 #endif
               this._initMenuItemWithFile(this._contentSandbox.selectedAppMenuItem,
                                          this._selectedApp);

application/palemoon/components/newtab/page.js

@@ -124,12 +124,6 @@ var gPage = {
 
     // Initialize the drop target shim.
     gDropTargetShim.init();
-
-#ifdef XP_MACOSX
-    // Workaround to prevent a delay on MacOSX due to a slow drop animation.
-    document.addEventListener("dragover", this, false);
-    document.addEventListener("drop", this, false);
-#endif
   },
 
   /**

application/palemoon/components/nsBrowserGlue.js

@@ -97,11 +97,9 @@ function BrowserGlue() {
   this._init();
 }
 
-#ifndef XP_MACOSX
+# We don't have the concept of zero-window sessions on any supported OS-es
-# OS X has the concept of zero-window sessions and therefore ignores the
+# and therefore have to observe the browser-lastwindow-close-* topics.
-# browser-lastwindow-close-* topics.
 #define OBSERVE_LASTWINDOW_CLOSE_TOPICS 1
-#endif
 
 BrowserGlue.prototype = {
   _saveSession: false,

application/palemoon/components/pageinfo/pageInfo.xul

@@ -11,10 +11,6 @@
   %pageInfoDTD;
 ]>
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-#endif
-
 <window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="Browser:page-info"
@@ -66,11 +62,7 @@
   <keyset id="pageInfoKeySet">
     <key key="&closeWindow.key;" modifiers="accel" command="cmd_close"/>
     <key keycode="VK_ESCAPE"                       command="cmd_close"/>
-#ifdef XP_MACOSX
-    <key key="."                 modifiers="meta"  command="cmd_close"/>
-#else
     <key keycode="VK_F1"                           command="cmd_help"/>
-#endif
     <key key="&copy.key;"        modifiers="accel" command="cmd_copy"/>
     <key key="&selectall.key;"   modifiers="accel" command="cmd_selectall"/>
     <key key="&selectall.key;"   modifiers="alt"   command="cmd_selectall"/>
@@ -500,8 +492,4 @@
     <!-- Others added by overlay -->
   </deck>
 
-#ifdef XP_MACOSX
-#include ../../base/content/browserMountPoints.inc
-#endif
-
 </window>

application/palemoon/components/places/content/browserPlacesViews.js

@@ -312,12 +312,6 @@ PlacesViewBase.prototype = {
           PlacesUtils.livemarks.getLivemark({ id: itemId })
             .then(aLivemark => {
               element.setAttribute("livemark", "true");
-#ifdef XP_MACOSX
-              // OS X native menubar doesn't track list-style-images since
-              // it doesn't have a frame (bug 733415).  Thus enforce updating.
-              element.setAttribute("image", "");
-              element.removeAttribute("image");
-#endif
               this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
             }, () => undefined);
         }
@@ -329,10 +323,6 @@ PlacesViewBase.prototype = {
           popup.setAttribute("placespopup", "true");
         }
 
-#ifdef XP_MACOSX
-        // No context menu on mac.
-        popup.setAttribute("context", "placesContext");
-#endif
         element.appendChild(popup);
         element.className = "menu-iconic bookmark-item";
 
@@ -486,12 +476,6 @@ PlacesViewBase.prototype = {
       let menu = elt.parentNode;
       if (!menu.hasAttribute("livemark")) {
         menu.setAttribute("livemark", "true");
-#ifdef XP_MACOSX
-        // OS X native menubar doesn't track list-style-images since
-        // it doesn't have a frame (bug 733415).  Thus enforce updating.
-        menu.setAttribute("image", "");
-        menu.removeAttribute("image");
-#endif
       }
 
       PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId })
@@ -999,9 +983,7 @@ PlacesToolbar.prototype = {
         popup.setAttribute("placespopup", "true");
         button.appendChild(popup);
         popup._placesNode = PlacesUtils.asContainer(aChild);
-#ifndef XP_MACOSX
         popup.setAttribute("context", "placesContext");
-#endif
 
         this._domNodes.set(aChild, popup);
       }
@@ -1679,16 +1661,6 @@ function PlacesMenu(aPopupShowingEvent, aPlace) {
   this._addEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true);
   this._addEventListeners(window, ["unload"], false);
 
-#ifdef XP_MACOSX
-  // Must walk up to support views in sub-menus, like Bookmarks Toolbar menu.
-  for (let elt = this._viewElt.parentNode; elt; elt = elt.parentNode) {
-    if (elt.localName == "menubar") {
-      this._nativeView = true;
-      break;
-    }
-  }
-#endif
-
   PlacesViewBase.call(this, aPlace);
   this._onPopupShowing(aPopupShowingEvent);
 }

application/palemoon/components/places/content/downloadsViewOverlay.xul

@@ -35,9 +35,6 @@
 
   <toolbar id="placesToolbar">
     <toolbarbutton id="clearDownloadsButton"
-#ifdef XP_MACOSX
-                   class="tabbable"
-#endif
                    insertbefore="libraryToolbarSpacer"
                    label="&clearDownloadsButton.label;"
                    command="downloadsCmd_clearDownloads"

application/palemoon/components/places/content/history-panel.xul

@@ -33,9 +33,6 @@
   <commandset id="placesCommands"/>
 
   <keyset id="editMenuKeys">
-#ifdef XP_MACOSX
-    <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
-#endif
   </keyset>
 
   <!-- required to overlay the context menu -->

application/palemoon/components/places/content/menu.xml

@@ -304,19 +304,6 @@
         if (elt.parentNode != this)
           return;
 
-#ifdef XP_MACOSX
-        // XXX: The following check is a temporary hack until bug 420033 is
-        // resolved.
-        let parentElt = elt.parent;
-        while (parentElt) {
-          if (parentElt.id == "bookmarksMenuPopup" ||
-              parentElt.id == "goPopup")
-            return;
-
-          parentElt = parentElt.parentNode;
-        }
-#endif
-
         if (window.XULBrowserWindow) {
           let elt = event.target;
           let placesNode = elt._placesNode;

application/palemoon/components/places/content/places.js

@@ -62,27 +62,6 @@ var PlacesOrganizer = {
     PlacesSearchBox.init();
 
     window.addEventListener("AppCommand", this, true);
-#ifdef XP_MACOSX
-    // 1. Map Edit->Find command to OrganizerCommand_find:all.  Need to map
-    // both the menuitem and the Find key.
-    var findMenuItem = document.getElementById("menu_find");
-    findMenuItem.setAttribute("command", "OrganizerCommand_find:all");
-    var findKey = document.getElementById("key_find");
-    findKey.setAttribute("command", "OrganizerCommand_find:all");
-
-    // 2. Disable some keybindings from browser.xul
-    var elements = ["cmd_handleBackspace", "cmd_handleShiftBackspace"];
-    for (var i=0; i < elements.length; i++) {
-      document.getElementById(elements[i]).setAttribute("disabled", "true");
-    }
-    
-    // 3. Disable the keyboard shortcut for the History menu back/forward
-    // in order to support those in the Library
-    var historyMenuBack = document.getElementById("historyMenuBack");
-    historyMenuBack.removeAttribute("key");
-    var historyMenuForward = document.getElementById("historyMenuForward");
-    historyMenuForward.removeAttribute("key");
-#endif
 
     // remove the "Properties" context-menu item, we've our own details pane
     document.getElementById("placesContext")

application/palemoon/components/places/content/places.xul

@@ -13,13 +13,9 @@
 
 <?xul-overlay href="chrome://browser/content/places/editBookmarkOverlay.xul"?>
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-#else
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
-#endif
 
 <!DOCTYPE window [
 <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
@@ -53,12 +49,8 @@
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-#ifdef XP_MACOSX
-#include ../../../base/content/browserMountPoints.inc
-#else
   <commandset id="editMenuCommands"/>
   <commandset id="placesCommands"/>
-#endif
   <keyset id="placesCommandKeys"/>
 
   <commandset id="organizerCommandSet">
@@ -94,7 +86,6 @@
          modifiers="accel"/>
 
     <!-- Back/Forward Keys Support -->
-#ifndef XP_MACOSX
     <key id="placesKey_goBackKb"
          keycode="VK_LEFT"
          command="OrganizerCommand:Back"
@@ -103,16 +94,6 @@
          keycode="VK_RIGHT"
          command="OrganizerCommand:Forward"
          modifiers="alt"/>
-#else
-    <key id="placesKey_goBackKb"
-         keycode="VK_LEFT"
-         command="OrganizerCommand:Back"
-         modifiers="accel"/>
-    <key id="placesKey_goForwardKb"
-         keycode="VK_RIGHT"
-         command="OrganizerCommand:Forward"
-         modifiers="accel"/>
-#endif
 #ifdef XP_UNIX
     <key id="placesKey_goBackKb2"
          key="&goBackCmd.commandKey;"
@@ -126,9 +107,6 @@
   </keyset>
 
   <keyset id="editMenuKeys">
-#ifdef XP_MACOSX
-    <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
-#endif
   </keyset>
 
   <popupset id="placesPopupset">
@@ -150,17 +128,12 @@
                      tooltiptext="&forwardButton.tooltip;"
                      disabled="true"/>
 
-#ifdef XP_MACOSX
-        <toolbarbutton type="menu" class="tabbable"
-              onpopupshowing="document.getElementById('placeContent').focus()"
-#else
 #ifdef MOZ_WIDGET_GTK
       <menubar id="placesMenu" _moz-menubarkeeplocal="true">
 #else
       <menubar id="placesMenu">
 #endif
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
-#endif
               id="organizeButton" label="&organize.label;"
               tooltiptext="&organize.tooltip;">
           <menupopup id="organizeButtonPopup">
@@ -177,7 +150,6 @@
                       label="&cmd.new_separator.label;"
                       accesskey="&cmd.new_separator.accesskey;"/>
 
-#ifndef XP_MACOSX
             <menuseparator id="orgUndoSeparator"/>
 
             <menuitem id="orgUndo"
@@ -225,20 +197,12 @@
                       key="key_selectAll"
                       accesskey="&selectAllCmd.accesskey;"/>
 
-#endif
             <menuseparator id="orgMoveSeparator"/>
 
             <menuitem id="orgMoveBookmarks"
                       command="placesCmd_moveBookmarks"
                       label="&cmd.moveBookmarks.label;"
                       accesskey="&cmd.moveBookmarks.accesskey;"/>
-#ifdef XP_MACOSX
-            <menuitem id="orgDelete"
-                      command="cmd_delete"
-                      label="&deleteCmd.label;"
-                      key="key_delete"
-                      accesskey="&deleteCmd.accesskey;"/>
-#else
             <menuseparator id="orgCloseSeparator"/>
 
             <menuitem id="orgClose"
@@ -246,15 +210,9 @@
                       label="&file.close.label;"
                       accesskey="&file.close.accesskey;"
                       oncommand="close();"/>
-#endif
           </menupopup>
-#ifdef XP_MACOSX
-        </toolbarbutton>
-        <toolbarbutton type="menu" class="tabbable"
-#else
         </menu>
         <menu accesskey="&views.accesskey;" class="menu-iconic"
-#endif
               id="viewMenu" label="&views.label;"
               tooltiptext="&views.tooltip;">
           <menupopup id="viewMenuPopup">
@@ -282,13 +240,8 @@
               </menupopup>
             </menu>
           </menupopup>
-#ifdef XP_MACOSX
-        </toolbarbutton>
-        <toolbarbutton type="menu" class="tabbable"
-#else
         </menu>
         <menu accesskey="&maintenance.accesskey;" class="menu-iconic"
-#endif
               id="maintenanceButton" label="&maintenance.label;"
               tooltiptext="&maintenance.tooltip;">
           <menupopup id="maintenanceButtonPopup">
@@ -315,12 +268,8 @@
                       label="&exportBookmarksToHTML.label;"
                       accesskey="&exportBookmarksToHTML.accesskey;"/>
           </menupopup>
-#ifdef XP_MACOSX
-        </toolbarbutton>
-#else
         </menu>
       </menubar>
-#endif
 
       <spacer id="libraryToolbarSpacer" flex="1"/>
 

application/palemoon/components/places/content/sidebarUtils.js

@@ -30,11 +30,7 @@ var SidebarUtils = {
         mouseInGutter = aEvent.clientX < rect.x;
     }
 
-#ifdef XP_MACOSX
-    var modifKey = aEvent.metaKey || aEvent.shiftKey;
-#else
     var modifKey = aEvent.ctrlKey || aEvent.shiftKey;
-#endif
 
     var isContainer = tbo.view.isContainer(cell.row);
     var openInTabs = isContainer &&

application/palemoon/components/preferences/applicationManager.js

@@ -2,11 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifdef XP_MACOSX
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-#endif
-
 var gAppManagerDialog = {
   _removed: [],
 

application/palemoon/components/preferences/applications.js

@@ -95,13 +95,6 @@ function getFileDisplayName(file) {
       return file.getVersionInfoField("FileDescription");
     } catch (e) {}
   }
-#endif
-#ifdef XP_MACOSX
-  if (file instanceof Ci.nsILocalFileMac) {
-    try {
-      return file.bundleDisplayName;
-    } catch (e) {}
-  }
 #endif
   return file.leafName;
 }
@@ -1332,11 +1325,7 @@ var gApplicationsPane = {
 #ifdef XP_WIN
 #expand    aExecutable.leafName != "__MOZ_APP_NAME__.exe";
 #else
-#ifdef XP_MACOSX
-#expand    aExecutable.leafName != "__MOZ_MACBUNDLE_NAME__";
-#else
 #expand    aExecutable.leafName != "__MOZ_APP_NAME__-bin";
-#endif
 #endif
   },
 

application/palemoon/components/preferences/colors.xul

@@ -6,9 +6,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-#ifdef XP_MACOSX
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/colors.dtd" >
 
@@ -17,11 +14,7 @@
             title="&colorsDialog.title;"
             dlgbuttons="accept,cancel,help"
             ondialoghelp="openPrefsHelp()"
-#ifdef XP_MACOSX
-            style="width: &window.macWidth; !important;">
-#else
             style="width: &window.width; !important;">
-#endif
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
   <prefpane id="ColorsDialogPane"

application/palemoon/components/preferences/connection.xul

@@ -16,11 +16,7 @@
             onbeforeaccept="return gConnectionsDialog.beforeAccept();"
             onload="gConnectionsDialog.checkForSystemProxy();"
             ondialoghelp="openPrefsHelp()"
-#ifdef XP_MACOSX
-            style="width: &window.macWidth; !important;">
-#else
             style="width: &window.width; !important;">
-#endif
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 

application/palemoon/components/preferences/cookies.js

@@ -734,11 +734,7 @@ var gCookiesWindow = {
   },
 
   onCookieKeyPress: function(aEvent) {
-    if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE
+    if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) {
-#ifdef XP_MACOSX
-        || aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE
-#endif
-       ) {
       this.deleteCookie();
     }
   },

application/palemoon/components/preferences/cookies.xul

@@ -96,10 +96,8 @@
       <button id="removeAllCookies" disabled="true" icon="clear"
               oncommand="gCookiesWindow.deleteAllCookies();"/>
       <spacer flex="1"/>
-#ifndef XP_MACOSX
       <button oncommand="close();" icon="close"
               label="&button.close.label;" accesskey="&button.close.accesskey;"/>
-#endif
     </hbox>
     <resizer type="window" dir="bottomend"/>
   </hbox>

application/palemoon/components/preferences/fonts.xul

@@ -6,9 +6,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-#ifdef XP_MACOSX
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-#endif
 
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/fonts.dtd" >
 

application/palemoon/components/preferences/languages.xul

@@ -8,9 +8,6 @@
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/languages.dtd">
 
 <?xml-stylesheet href="chrome://global/skin/"?>
-#ifdef XP_MACOSX
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-#endif
 
 <prefwindow id="LanguagesDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

application/palemoon/components/preferences/main.xul

@@ -147,13 +147,8 @@
                      onsyncfrompreference="return gMainPane.displayDownloadDirPref();"
                      onsynctopreference="return gMainPane.getFolderListPref()"/>
           <button id="chooseFolder" oncommand="gMainPane.chooseFolder();"
-#ifdef XP_MACOSX
-                  accesskey="&chooseFolderMac.accesskey;"
-                  label="&chooseFolderMac.label;"
-#else
                   accesskey="&chooseFolderWin.accesskey;"
                   label="&chooseFolderWin.label;"
-#endif
                   preference="browser.download.folderList"
                   onsynctopreference="return gMainPane.getFolderListPref();"/>
         </hbox>

application/palemoon/components/preferences/permissions.js

@@ -347,11 +347,7 @@ var gPermissionManager = {
 
   onPermissionKeyPress: function (aEvent)
   {
-    if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE
+    if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) {
-#ifdef XP_MACOSX
-        || aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE
-#endif
-       ) {
       this.onPermissionDeleted();
     }
   },

application/palemoon/components/preferences/preferences.xul

@@ -28,10 +28,6 @@
 #define USE_WIN_TITLE_STYLE
 #endif
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-#endif
-
 <prefwindow type="prefwindow"
             id="BrowserPreferences"
             windowtype="Browser:Preferences"
@@ -40,20 +36,14 @@
             title="&prefWindow.titleWin;"
 #else
 #ifdef XP_UNIX
-#ifndef XP_MACOSX
             title="&prefWindow.titleGNOME;"
 #endif
-#endif
 #endif
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 #ifdef USE_WIN_TITLE_STYLE
             style="&prefWinMinSize.styleWin2;"
-#else
-#ifdef XP_MACOSX
-            style="&prefWinMinSize.styleMac;"
 #else
             style="&prefWinMinSize.styleGNOME;"
-#endif
 #endif
             onunload="if (typeof gSecurityPane != 'undefined') gSecurityPane.syncAddonSecurityLevel();"
             ondialogaccept="gNewtabUrl.writeNewtabUrl();">
@@ -84,9 +74,5 @@
     <prefpane id="paneAdvanced" label="&paneAdvanced.title;"
               src="chrome://browser/content/preferences/advanced.xul"/>
 
-#ifdef XP_MACOSX
-#include ../../base/content/browserMountPoints.inc
-#endif
-
 </prefwindow>
 

application/palemoon/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml

@@ -13,11 +13,7 @@
   %globalDTD;
   <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
   %browserDTD;
-#ifdef XP_MACOSX
-  <!ENTITY basePBMenu.label   "&fileMenu.label;">
-#else
   <!ENTITY basePBMenu.label   "<span class='appMenuButton'>&brandShortName;</span><span class='fileMenu'>&fileMenu.label;</span>">
-#endif
   <!ENTITY % privatebrowsingpageDTD SYSTEM "chrome://browser/locale/aboutPrivateBrowsing.dtd">
   %privatebrowsingpageDTD;
 ]>
@@ -48,9 +44,7 @@
         document.title = "]]>&privatebrowsingpage.title.normal;<![CDATA[";
         setFavIcon("chrome://global/skin/icons/question-16.png");
       } else {
-#ifndef XP_MACOSX
         document.title = "]]>&privatebrowsingpage.title;<![CDATA[";
-#endif
         setFavIcon("chrome://browser/skin/Privacy-16.png");
       }
 

application/palemoon/components/search/content/search.xml

@@ -804,11 +804,9 @@
                phase="capturing"
                action="return this.openSearch();"/>
 
-#ifndef XP_MACOSX
       <handler event="keypress" keycode="VK_F4"
                phase="capturing"
                action="return this.openSearch();"/>
-#endif
 
       <handler event="dragover">
       <![CDATA[

application/palemoon/components/sessionstore/SessionStore.jsm

@@ -775,9 +775,7 @@ var SessionStoreInternal = {
 
       if (closedWindowState) {
         let newWindowState;
-#ifndef XP_MACOSX
         if (!this._doResumeSession()) {
-#endif
           // We want to split the window up into pinned tabs and unpinned tabs.
           // Pinned tabs should be restored. If there are any remaining tabs,
           // they should be added back to _closedWindows.
@@ -801,7 +799,6 @@ var SessionStoreInternal = {
             delete normalTabsState.windows[0].__lastSessionWindowID;
             this._closedWindows[closedWindowIndex] = normalTabsState.windows[0];
           }
-#ifndef XP_MACOSX
         }
         else {
           // If we're just restoring the window, make sure it gets removed from
@@ -810,7 +807,6 @@ var SessionStoreInternal = {
           newWindowState = closedWindowState;
           delete newWindowState.hidden;
         }
-#endif
         if (newWindowState) {
           // Ensure that the window state isn't hidden
           this._restoreCount = 1;
@@ -911,11 +907,9 @@ var SessionStoreInternal = {
         this._updateCookies(windows);
       }
 
-#ifndef XP_MACOSX
       // Until we decide otherwise elsewhere, this window is part of a series
       // of closing windows to quit.
       winData._shouldRestore = true;
-#endif
 
       // Save the window if it has multiple tabs or a single saveable tab and
       // it's not private.
@@ -2529,7 +2523,6 @@ var SessionStoreInternal = {
     // shallow copy this._closedWindows to preserve current state
     let lastClosedWindowsCopy = this._closedWindows.slice();
 
-#ifndef XP_MACOSX
     // If no non-popup browser window remains open, return the state of the last
     // closed window(s). We only want to do this when we're actually "ending"
     // the session.
@@ -2543,7 +2536,6 @@ var SessionStoreInternal = {
         total.unshift(lastClosedWindowsCopy.shift())
       } while (total[0].isPopup && lastClosedWindowsCopy.length > 0)
     }
-#endif
 
     if (aPinnedOnly) {
       // perform a deep copy so that existing session variables are not changed.
@@ -3776,7 +3768,6 @@ var SessionStoreInternal = {
       }
     }
 
-#ifndef XP_MACOSX
     // We want to restore closed windows that are marked with _shouldRestore.
     // We're doing this here because we want to control this only when saving
     // the file.
@@ -3791,7 +3782,6 @@ var SessionStoreInternal = {
         break;
       }
     }
-#endif
 
     if (pinnedOnly) {
       // Save original resume_session_once preference for when quiting browser,
@@ -4408,7 +4398,6 @@ var SessionStoreInternal = {
     if (this._closedWindows.length <= this._max_windows_undo)
       return;
     let spliceTo = this._max_windows_undo;
-#ifndef XP_MACOSX
     let normalWindowIndex = 0;
     // try to find a non-popup window in this._closedWindows
     while (normalWindowIndex < this._closedWindows.length &&
@@ -4416,7 +4405,6 @@ var SessionStoreInternal = {
       normalWindowIndex++;
     if (normalWindowIndex >= this._max_windows_undo)
       spliceTo = normalWindowIndex + 1;
-#endif
     this._closedWindows.splice(spliceTo, this._closedWindows.length);
   },
 

application/palemoon/components/sessionstore/content/aboutSessionRestore.js

@@ -141,11 +141,7 @@ function onListClick(aEvent) {
   if (cell.col) {
     // Restore this specific tab in the same window for middle/double/accel clicking
     // on a tab's title.
-#ifdef XP_MACOSX
-    let accelKey = aEvent.metaKey;
-#else
     let accelKey = aEvent.ctrlKey;
-#endif
     if ((aEvent.button == 1 || aEvent.button == 0 && aEvent.detail == 2 || accelKey) &&
         cell.col.id == "title" &&
         !treeView.isContainer(cell.row)) {

application/palemoon/components/shell/ShellService.jsm

@@ -31,7 +31,7 @@ var ShellServiceInternal = {
                                   .QueryInterface(Ci.nsIGNOMEShellService);
       return linuxShellService.canSetDesktopBackground;
     }
-#elif defined(XP_WIN) || defined(XP_MACOSX)
+#elif defined(XP_WIN)
     return true;
 #else
     return false;

application/palemoon/components/shell/content/setDesktopBackground.js

@@ -5,13 +5,8 @@
 var Ci = Components.interfaces;
 
 var gSetBackground = {
-#ifdef XP_MACOSX
-  _position        : "STRETCH",
-  _backgroundColor : undefined,
-#else
   _position        : "",
   _backgroundColor : 0,
-#endif
   _screenWidth     : 0,
   _screenHeight    : 0,
   _image           : null,
@@ -28,9 +23,6 @@ var gSetBackground = {
     this._canvas = document.getElementById("screen");
     this._screenWidth = screen.width;
     this._screenHeight = screen.height;
-#ifdef XP_MACOSX
-    document.documentElement.getButton("accept").hidden = true;
-#endif
     if (this._screenWidth / this._screenHeight >= 1.6)
       document.getElementById("monitor").setAttribute("aspectratio", "16:10");
 
@@ -63,37 +55,14 @@ var gSetBackground = {
     var ctx = this._canvas.getContext("2d");
     ctx.scale(this._canvas.clientWidth / this._screenWidth, this._canvas.clientHeight / this._screenHeight);
 
-#ifdef XP_MACOSX
-    // Make sure to reset the button state in case the user has already
-    // set an image as their desktop background.
-    var setDesktopBackground = document.getElementById("setDesktopBackground");
-    setDesktopBackground.hidden = false;
-    var bundle = document.getElementById("backgroundBundle");
-    setDesktopBackground.label = bundle.getString("DesktopBackgroundSet");
-    setDesktopBackground.disabled = false;
-
-    document.getElementById("showDesktopPreferences").hidden = true;
-#else
     this._initColor();
-#endif
     this.updatePosition();
   },
 
   setDesktopBackground: function ()
   {
-#ifdef XP_MACOSX
-      Components.classes["@mozilla.org/observer-service;1"]
-                .getService(Ci.nsIObserverService)
-                .addObserver(this, "shell:desktop-background-changed", false);
-
-      var bundle = document.getElementById("backgroundBundle");
-      var setDesktopBackground = document.getElementById("setDesktopBackground");
-      setDesktopBackground.disabled = true;
-      setDesktopBackground.label = bundle.getString("DesktopBackgroundDownloading");
-#else
     document.persist("menuPosition", "value");
     this._shell.desktopBackgroundColor = this._hexStringToLong(this._backgroundColor);
-#endif
     this._shell.setDesktopBackground(this._image,
                                      Ci.nsIShellService["BACKGROUND_" + this._position]);
   },
@@ -103,9 +72,7 @@ var gSetBackground = {
     var ctx = this._canvas.getContext("2d");
     ctx.clearRect(0, 0, this._screenWidth, this._screenHeight);
 
-#ifndef XP_MACOSX
     this._position = document.getElementById("menuPosition").value;
-#endif
 
     switch (this._position) {
       case "TILE":
@@ -161,24 +128,6 @@ var gSetBackground = {
   }
 };
 
-#ifdef XP_MACOSX
-gSetBackground["observe"] = function (aSubject, aTopic, aData)
-{
-  if (aTopic == "shell:desktop-background-changed") {
-    document.getElementById("setDesktopBackground").hidden = true;
-    document.getElementById("showDesktopPreferences").hidden = false;
-
-    Components.classes["@mozilla.org/observer-service;1"]
-              .getService(Ci.nsIObserverService)
-              .removeObserver(this, "shell:desktop-background-changed");
-  }
-};
-
-gSetBackground["showDesktopPrefs"] = function()
-{
-  this._shell.openApplication(Ci.nsIMacShellService.APPLICATION_DESKTOP);
-};
-#else
 gSetBackground["_initColor"] = function ()
 {
   var color = this._shell.desktopBackgroundColor;
@@ -214,4 +163,3 @@ gSetBackground["_rgbToHex"] = function (aR, aG, aB)
   return "#" + [aR, aG, aB].map(aInt => aInt.toString(16).replace(/^(.)$/, "0$1"))
                            .join("").toUpperCase();
 };
-#endif

application/palemoon/components/shell/content/setDesktopBackground.xul

@@ -9,18 +9,10 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://browser/locale/setDesktopBackground.dtd">
 
-#ifdef XP_MACOSX
-<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
-#endif
-
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         windowtype="Shell:SetDesktopBackground"
-#ifndef XP_MACOSX
         buttons="accept,cancel"
-#else
-        buttons="accept"
-#endif
         buttonlabelaccept="&setDesktopBackground.title;"
         onload="gSetBackground.load();"
         ondialogaccept="gSetBackground.setDesktopBackground();"
@@ -33,7 +25,6 @@
     <script type="application/javascript" src="chrome://browser/content/setDesktopBackground.js"/>
     <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
-#ifndef XP_MACOSX
     <hbox align="center">
       <label value="&position.label;"/>
       <menulist id="menuPosition"
@@ -53,7 +44,6 @@
                    type="button" 
                    onchange="gSetBackground.updateColor(this.color);"/> 
     </hbox>
-#endif
     <groupbox align="center">
       <caption label="&preview.label;"/>
       <stack>
@@ -63,22 +53,4 @@
       </stack>
     </groupbox>
     
-#ifdef XP_MACOSX
-    <separator/>
-    
-    <hbox align="right">
-      <button id="setDesktopBackground"
-              label="&setDesktopBackground.title;" 
-              oncommand="gSetBackground.setDesktopBackground();"/>
-      <button id="showDesktopPreferences"
-              label="&openDesktopPrefs.label;"
-              oncommand="gSetBackground.showDesktopPrefs();"
-              hidden="true"/>
-    </hbox>
-#endif
-
-#ifdef XP_MACOSX
-#include ../../../base/content/browserMountPoints.inc
-#endif
-
 </dialog>

application/palemoon/installer/package-manifest.in

@@ -32,14 +32,6 @@
 
 #filter substitution
 
-#ifdef XP_MACOSX
-; Mac bundle stuff
-@APPNAME@/Contents/Info.plist
-@APPNAME@/Contents/PkgInfo
-@RESPATH@/firefox.icns
-@RESPATH@/document.icns
-#endif
-
 [@AB_CD@]
 @RESPATH@/browser/chrome/@AB_CD@@JAREXT@
 @RESPATH@/browser/chrome/@AB_CD@.manifest
@@ -78,17 +70,8 @@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 #endif
 #endif
-#ifdef XP_MACOSX
-@BINPATH@/XUL
-#else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
-#endif
-#ifdef XP_MACOSX
-@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
-#else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
-#endif
 #ifdef XP_WIN32
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
@@ -135,10 +118,8 @@
 @RESPATH@/browser/blocklist.xml
 @RESPATH@/browser/ua-update.json
 #ifdef XP_UNIX
-#ifndef XP_MACOSX
 @RESPATH@/run-mozilla.sh
 #endif
-#endif
 
 ; [Components]
 @RESPATH@/components/*
@@ -166,8 +147,6 @@
 #endif
 #ifdef MOZ_ENABLE_XREMOTE
 #endif
-#ifdef XP_MACOSX
-#endif
 
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
@@ -212,7 +191,6 @@
 
 ; shell icons
 #ifdef XP_UNIX
-#ifndef XP_MACOSX
 ; shell icons
 @RESPATH@/browser/icons/*.png
 #ifdef MOZ_UPDATER
@@ -220,7 +198,6 @@
 @RESPATH@/icons/updater.png
 #endif
 #endif
-#endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
@@ -267,21 +244,11 @@
 @RESPATH@/res/table-remove-row-hover.gif
 @RESPATH@/res/table-remove-row.gif
 @RESPATH@/res/grabber.gif
-#ifdef XP_MACOSX
-@RESPATH@/res/cursors/*
-#endif
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
-#if defined(XP_MACOSX)
-; For SafariProfileMigrator.js.
-@RESPATH@/res/langGroups.properties
-#endif
 @RESPATH@/res/language.properties
 @RESPATH@/res/entityTables/*
-#ifdef XP_MACOSX
-@RESPATH@/res/MainMenu.nib/
-#endif
 
 ; svg
 @RESPATH@/res/svg.css
@@ -322,12 +289,8 @@
 ; [Updater]
 ;
 #ifdef MOZ_UPDATER
-#ifdef XP_MACOSX
-@BINPATH@/updater.app/
-#else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
-#endif
 
 ; Shutdown Terminator
 

application/palemoon/installer/removed-files.in

@@ -69,22 +69,11 @@
 # Firefox 27
 @DIR_MACOS@distribution/extensions/testpilot@labs.mozilla.com.xpi
 
-# Mac OS X v2 signing removals
-#ifdef XP_MACOSX
-  @DIR_MACOS@active-update.xml
-  @DIR_MACOS@update-settings.ini
-  @DIR_MACOS@updates.xml
-  @DIR_MACOS@defaults/*
-  @DIR_MACOS@updates/*
-#endif
-
 # Common Directory removals
 @DIR_MACOS@chrome/
 #ifdef XP_UNIX
-  #ifndef XP_MACOSX
+  chrome/icons/
-    chrome/icons/
+  chrome/icons/default/
-    chrome/icons/default/
-  #endif
 #endif
 @DIR_MACOS@chrome/overlayinfo/
 @DIR_MACOS@components/
@@ -106,11 +95,5 @@
 @DIR_MACOS@greprefs/
 @DIR_MACOS@jssubloader/
 @DIR_MACOS@modules/
-#ifdef XP_MACOSX
-  @DIR_MACOS@plugins/Default Plugin.plugin/*
-  @DIR_MACOS@plugins/JavaEmbeddingPlugin.bundle/*
-  @DIR_MACOS@plugins/MRJPlugin.plugin/*
-  Contents/Plug-Ins/PrintPDE.plugin/*
-#endif
 @DIR_MACOS@searchplugins/*
 @DIR_MACOS@webapprt/components/