Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1126376 - Fix non-NIGHTLY_BUILD warnings-as-errors in toolkit/xre. r=Mossop

Browse Source
This commit is contained in:
Chris Peterson 2015-01-27 10:11:08 -08:00
parent 4d7c72cbf7
commit 92e95883b2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/xre/nsAppRunner.cpp
View File

@ -1899,7 +1899,6 @@ ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir,
}
}
static nsresult
ProfileMissingDialog(nsINativeAppSupport* aNative)
{
@ -2202,7 +2201,9 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n
// Check that the profile to reset is the default since reset and migration are only
// supported in that case.
bool currentIsSelected;
GetCurrentProfileIsDefault(aProfileSvc, lf, &currentIsSelected);
rv = GetCurrentProfileIsDefault(aProfileSvc, lf, &currentIsSelected);
NS_ENSURE_SUCCESS(rv, rv);
if (!currentIsSelected) {
NS_WARNING("Profile reset is only supported for the default profile.");
gDoProfileReset = gDoMigration = false;
@ -3501,7 +3502,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
SetShutdownChecks();
// Enable Telemetry IO Reporting on DEBUG, nightly and local builds
#ifdef DEBUG
mozilla::Telemetry::InitIOReporting(gAppData->xreDirectory);
@ -4578,6 +4578,7 @@ XRE_IsParentProcess()
return XRE_GetProcessType() == GeckoProcessType_Default;
}
#ifdef NIGHTLY_BUILD
static void
LogE10sBlockedReason(const char *reason) {
gBrowserTabsRemoteDisabledReason.Assign(NS_ConvertASCIItoUTF16(reason));
@ -4590,6 +4591,7 @@ LogE10sBlockedReason(const char *reason) {
console->LogStringMessage(msg.get());
}
}
#endif
bool
mozilla::BrowserTabsRemoteAutostart()
@ -4661,7 +4663,10 @@ mozilla::BrowserTabsRemoteAutostart()
if (accelDisabled) {
gBrowserTabsRemoteAutostart = false;
#ifdef NIGHTLY_BUILD
LogE10sBlockedReason("Hardware acceleration is disabled");
#endif
}
}
#endif // defined(XP_MACOSX)
@ -4732,4 +4737,3 @@ SetupErrorHandling(const char* progname)
// Unbuffer stdout, needed for tinderbox tests.
setbuf(stdout, 0);
}