Use NS_LITERAL_STRING instead of NS_ConvertASCIItoUCS2 where possible
(i.e. where the string is a literal). Bug 104159, r=jag, sr=alecf git-svn-id: svn://10.0.0.236/trunk@107987 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2206,8 +2206,7 @@ nsDocShell::LoadURI(const PRUnichar * aURI, PRUint32 aLoadFlags)
|
||||
|
||||
nsXPIDLString messageStr;
|
||||
NS_ENSURE_SUCCESS(stringBundle->
|
||||
GetStringFromName(NS_ConvertASCIItoUCS2
|
||||
("protocolNotFound").get(),
|
||||
GetStringFromName(NS_LITERAL_STRING("protocolNotFound").get(),
|
||||
getter_Copies(messageStr)),
|
||||
NS_ERROR_FAILURE);
|
||||
|
||||
@@ -5232,7 +5231,7 @@ nsDocShell::LoadHistoryEntry(nsISHEntry * aEntry, PRUint32 aLoadType)
|
||||
|
||||
if (stringBundle && prompter) {
|
||||
nsXPIDLString messageStr;
|
||||
nsresult rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2("repostConfirm").get(),
|
||||
nsresult rv = stringBundle->GetStringFromName(NS_LITERAL_STRING("repostConfirm").get(),
|
||||
getter_Copies(messageStr));
|
||||
|
||||
if (NS_SUCCEEDED(rv) && messageStr) {
|
||||
|
||||
Reference in New Issue
Block a user