wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on netwerk. r=nfroyd

Browse Source
This commit is contained in:
Makoto Kato 2015-10-28 14:30:07 +09:00
parent df47f5b457
commit 2f5735f9c5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netwerk/base/CaptivePortalService.cpp
View File

@ -69,7 +69,7 @@ CaptivePortalService::PerformCheck()
LOG(("CaptivePortalService::PerformCheck - Calling CheckCaptivePortal\n"));
mRequestInProgress = true;
mCaptivePortalDetector->CheckCaptivePortal(
NS_LITERAL_STRING(kInterfaceName).get(), this);
MOZ_UTF16(kInterfaceName), this);
return NS_OK;
}
@ -164,7 +164,7 @@ CaptivePortalService::Stop()
mRequestInProgress = false;
mStarted = false;
if (mCaptivePortalDetector) {
mCaptivePortalDetector->Abort(NS_LITERAL_STRING(kInterfaceName).get());
mCaptivePortalDetector->Abort(MOZ_UTF16(kInterfaceName));
}
mCaptivePortalDetector = nullptr;
return NS_OK;
@ -281,7 +281,7 @@ CaptivePortalService::Prepare()
LOG(("CaptivePortalService::Prepare\n"));
// XXX: Finish preparation shouldn't be called until dns and routing is available.
if (mCaptivePortalDetector) {
mCaptivePortalDetector->FinishPreparation(NS_LITERAL_STRING(kInterfaceName).get());
mCaptivePortalDetector->FinishPreparation(MOZ_UTF16(kInterfaceName));
}
return NS_OK;
}

4
netwerk/base/nsIOService.cpp
View File

@ -1050,7 +1050,7 @@ nsIOService::SetOffline(bool offline)
if (observerService && mConnectivity) {
observerService->NotifyObservers(subject,
NS_IOSERVICE_OFFLINE_STATUS_TOPIC,
NS_LITERAL_STRING(NS_IOSERVICE_ONLINE).get());
MOZ_UTF16(NS_IOSERVICE_ONLINE));
}
}
}
@ -1133,7 +1133,7 @@ nsIOService::SetConnectivityInternal(bool aConnectivity)
observerService->NotifyObservers(
static_cast<nsIIOService *>(this),
NS_IOSERVICE_OFFLINE_STATUS_TOPIC,
NS_LITERAL_STRING(NS_IOSERVICE_ONLINE).get());
MOZ_UTF16(NS_IOSERVICE_ONLINE));
} else {
// If we were previously online and lost connectivity
// send the OFFLINE notification

2
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -358,7 +358,7 @@ nsHttpChannel::Connect()
const char16_t* params[] = { reportSpec.get(), reportScheme.get() };
uint32_t innerWindowId = mLoadInfo ? mLoadInfo->GetInnerWindowID() : 0;
CSP_LogLocalizedStr(NS_LITERAL_STRING("upgradeInsecureRequest").get(),
CSP_LogLocalizedStr(MOZ_UTF16("upgradeInsecureRequest"),
params, ArrayLength(params),
EmptyString(), // aSourceFile
EmptyString(), // aScriptSample