diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 7 | ||||
| -rw-r--r-- | toolkit/profile/nsToolkitProfileService.cpp | 43 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 17 |
3 files changed, 3 insertions, 64 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index ae0eea1c4..40ceb15ba 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -60,13 +60,6 @@ this.AppConstants = Object.freeze({ false, #endif - MOZ_DEV_EDITION: -#ifdef MOZ_DEV_EDITION - true, -#else - false, -#endif - MOZ_SERVICES_HEALTHREPORT: #ifdef MOZ_SERVICES_HEALTHREPORT true, diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp index 38b3a37f1..e818d27e6 100644 --- a/toolkit/profile/nsToolkitProfileService.cpp +++ b/toolkit/profile/nsToolkitProfileService.cpp @@ -425,22 +425,6 @@ nsToolkitProfileService::Init() nsToolkitProfile* currentProfile = nullptr; -#ifdef MOZ_DEV_EDITION - nsCOMPtr<nsIFile> ignoreSeparateProfile; - rv = mAppData->Clone(getter_AddRefs(ignoreSeparateProfile)); - if (NS_FAILED(rv)) - return rv; - - rv = ignoreSeparateProfile->AppendNative(NS_LITERAL_CSTRING("ignore-dev-edition-profile")); - if (NS_FAILED(rv)) - return rv; - - bool shouldIgnoreSeparateProfile; - rv = ignoreSeparateProfile->Exists(&shouldIgnoreSeparateProfile); - if (NS_FAILED(rv)) - return rv; -#endif - unsigned int c = 0; bool foundAuroraDefault = false; for (c = 0; true; ++c) { @@ -501,35 +485,8 @@ nsToolkitProfileService::Init() mChosen = currentProfile; this->SetDefaultProfile(currentProfile); } -#ifdef MOZ_DEV_EDITION - // Use the dev-edition-default profile if this is an Aurora build and - // ignore-dev-edition-profile is not present. - if (name.EqualsLiteral("dev-edition-default") && !shouldIgnoreSeparateProfile) { - mChosen = currentProfile; - foundAuroraDefault = true; - } -#endif } -#ifdef MOZ_DEV_EDITION - if (!foundAuroraDefault && !shouldIgnoreSeparateProfile) { - // If a single profile exists, it may not be already marked as default. - // Do it now to avoid problems when we create the dev-edition-default profile. - if (!mChosen && mFirst && !mFirst->mNext) - this->SetDefaultProfile(mFirst); - - // Create a default profile for aurora, if none was found. - nsCOMPtr<nsIToolkitProfile> profile; - rv = CreateProfile(nullptr, - NS_LITERAL_CSTRING("dev-edition-default"), - getter_AddRefs(profile)); - if (NS_FAILED(rv)) return rv; - mChosen = profile; - rv = Flush(); - if (NS_FAILED(rv)) return rv; - } -#endif - if (!mChosen && mFirst && !mFirst->mNext) // only one profile mChosen = mFirst; return NS_OK; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 5a51fd3e7..035d35a9d 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2173,9 +2173,9 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n return ShowProfileManager(aProfileSvc, aNative); } -#ifndef MOZ_DEV_EDITION - // If the only existing profile is the dev-edition-profile and this is not - // Developer Edition, then no valid profiles were found. + // Dev edition leftovers: + // If the only existing profile is the dev-edition-profile, + // then no valid profiles were found. if (count == 1) { nsCOMPtr<nsIToolkitProfile> deProfile; // GetSelectedProfile will auto-select the only profile if there's just one @@ -2186,7 +2186,6 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n count = 0; } } -#endif if (!count) { gDoMigration = true; @@ -2195,25 +2194,15 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n // create a default profile nsCOMPtr<nsIToolkitProfile> profile; nsresult rv = aProfileSvc->CreateProfile(nullptr, // choose a default dir for us -#ifdef MOZ_DEV_EDITION - NS_LITERAL_CSTRING("dev-edition-default"), -#else NS_LITERAL_CSTRING("default"), -#endif getter_AddRefs(profile)); if (NS_SUCCEEDED(rv)) { -#ifndef MOZ_DEV_EDITION aProfileSvc->SetDefaultProfile(profile); -#endif aProfileSvc->Flush(); rv = profile->Lock(nullptr, aResult); if (NS_SUCCEEDED(rv)) { if (aProfileName) -#ifdef MOZ_DEV_EDITION - aProfileName->AssignLiteral("dev-edition-default"); -#else aProfileName->AssignLiteral("default"); -#endif return NS_OK; } } |