diff options
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index a2f7b89b21..ce5da9cdac 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -32,16 +32,6 @@ #include "EventTracer.h" #endif -#ifdef XP_MACOSX -#include "nsVersionComparator.h" -#include "MacLaunchHelper.h" -#include "MacApplicationDelegate.h" -#include "MacAutoreleasePool.h" -// these are needed for sysctl -#include <sys/types.h> -#include <sys/sysctl.h> -#endif - #include "prmem.h" #include "prnetdb.h" #include "prprf.h" @@ -155,11 +145,6 @@ #include "WinUtils.h" #endif -#ifdef XP_MACOSX -#include "nsILocalFileMac.h" -#include "nsCommandLineServiceMac.h" -#endif - // for X remote support #ifdef MOZ_ENABLE_XREMOTE #include "XRemoteClient.h" @@ -175,10 +160,6 @@ #include <malloc.h> #endif -#if defined (XP_MACOSX) -#include <Carbon/Carbon.h> -#endif - #ifdef DEBUG #include "mozilla/Logging.h" #endif @@ -1122,12 +1103,6 @@ ScopedXPCOMStartup::~ScopedXPCOMStartup() NS_IF_RELEASE(gNativeAppSupport); if (mServiceManager) { -#ifdef XP_MACOSX - // On OS X, we need a pool to catch cocoa objects that are autoreleased - // during teardown. - mozilla::MacAutoreleasePool pool; -#endif - nsCOMPtr<nsIAppStartup> appStartup (do_GetService(NS_APPSTARTUP_CONTRACTID)); if (appStartup) appStartup->DestroyHiddenWindow(); @@ -1513,10 +1488,6 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, SaveToEnv("MOZ_LAUNCHED_CHILD=1"); -#if defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(gRestartArgc, gRestartArgv, true); - LaunchChildMac(gRestartArgc, gRestartArgv); -#else nsCOMPtr<nsIFile> lf; nsresult rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf)); if (NS_FAILED(rv)) @@ -1551,7 +1522,6 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, return NS_ERROR_FAILURE; #endif // XP_UNIX #endif // WP_WIN -#endif // WP_MACOSX return NS_ERROR_LAUNCHED_CHILD_PROCESS; } @@ -1622,15 +1592,9 @@ ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; -#ifndef XP_MACOSX sb->FormatStringFromName(aUnlocker ? u"restartMessageUnlocker" : u"restartMessageNoUnlocker", params, 2, getter_Copies(killMessage)); -#else - sb->FormatStringFromName(aUnlocker ? u"restartMessageUnlockerMac" - : u"restartMessageNoUnlockerMac", - params, 2, getter_Copies(killMessage)); -#endif nsXPIDLString killTitle; sb->FormatStringFromName(u"restartTitle", @@ -1774,10 +1738,6 @@ ShowProfileManager(nsIToolkitProfileService* aProfileSvc, rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); -#ifdef XP_MACOSX - CommandLineServiceMac::SetupMacCommandLine(gRestartArgc, gRestartArgv, true); -#endif - #ifdef XP_WIN // we don't have to wait here because profile manager window will pump // and DDE message will be handled @@ -2883,13 +2843,6 @@ XREMain::XRE_mainInit(bool* aExitFlag) if (NS_FAILED(rv)) return 2; -#ifdef XP_MACOSX - nsCOMPtr<nsIFile> parent; - greDir->GetParent(getter_AddRefs(parent)); - greDir = parent.forget(); - greDir->AppendNative(NS_LITERAL_CSTRING("Resources")); -#endif - greDir.forget(&mAppData->xreDirectory); } @@ -2923,40 +2876,6 @@ XREMain::XRE_mainInit(bool* aExitFlag) if (NS_FAILED(rv)) return 1; -#ifdef XP_MACOSX - // Set up ability to respond to system (Apple) events. This must occur before - // ProcessUpdates to ensure that links clicked in external applications aren't - // lost when updates are pending. - SetupMacApplicationDelegate(); - - if (EnvHasValue("MOZ_LAUNCHED_CHILD")) { - // This is needed, on relaunch, to force the OS to use the "Cocoa Dock - // API". Otherwise the call to ReceiveNextEvent() below will make it - // use the "Carbon Dock API". For more info see bmo bug 377166. - EnsureUseCocoaDockAPI(); - - // When the app relaunches, the original process exits. This causes - // the dock tile to stop bouncing, lose the "running" triangle, and - // if the tile does not permanently reside in the Dock, even disappear. - // This can be confusing to the user, who is expecting the app to launch. - // Calling ReceiveNextEvent without requesting any event is enough to - // cause a dock tile for the child process to appear. - const EventTypeSpec kFakeEventList[] = { { INT_MAX, INT_MAX } }; - EventRef event; - ::ReceiveNextEvent(GetEventTypeCount(kFakeEventList), kFakeEventList, - kEventDurationNoWait, false, &event); - } - - if (CheckArg("foreground")) { - // The original process communicates that it was in the foreground by - // adding this argument. This new process, which is taking over for - // the old one, should make itself the active application. - ProcessSerialNumber psn; - if (::GetCurrentProcess(&psn) == noErr) - ::SetFrontProcess(&psn); - } -#endif - SaveToEnv("MOZ_LAUNCHED_CHILD="); gRestartArgc = gArgc; @@ -3007,12 +2926,6 @@ XREMain::XRE_mainInit(bool* aExitFlag) } #endif -#ifdef XP_MACOSX - if ((GetCurrentEventKeyModifiers() & optionKey) && - !EnvHasValue("MOZ_DISABLE_SAFE_MODE_KEY")) - gSafeMode = true; -#endif - #ifdef XP_WIN { // Add CPU microcode version to the crash report as "CPUMicrocodeVersion". @@ -3810,19 +3723,6 @@ XREMain::XRE_mainRun() g_unsetenv ("DESKTOP_STARTUP_ID"); #endif -#ifdef XP_MACOSX - // we re-initialize the command-line service and do appleevents munging - // after we are sure that we're not restarting - cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); - NS_ENSURE_TRUE(cmdLine, NS_ERROR_FAILURE); - - CommandLineServiceMac::SetupMacCommandLine(gArgc, gArgv, false); - - rv = cmdLine->Init(gArgc, gArgv, - workingDir, nsICommandLine::STATE_INITIAL_LAUNCH); - NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); -#endif - nsCOMPtr<nsIObserverService> obsService = mozilla::services::GetObserverService(); if (obsService) |