remove *WithConversion from mac embedding code

261241 r=pink sr=darin
This commit is contained in:
cbiesinger%web.de 2004-09-30 14:17:28 +00:00
parent fab1a7c09e
commit e600b54a04
2 changed files with 5 additions and 8 deletions

View File

@ -570,9 +570,8 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
nsAutoString urlStr;
location->GetHref(urlStr);
#warning fix me
nsCAutoString urlCStr; urlCStr.AssignWithConversion(urlStr);
nsCOMPtr<nsIURI> url;
nsresult rv = NS_NewURI(getter_AddRefs(url), urlCStr.get());
nsresult rv = NS_NewURI(getter_AddRefs(url), urlStr);
if (NS_FAILED(rv))
return;

View File

@ -279,17 +279,15 @@ NS_IMETHODIMP CWebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
{
NS_ENSURE_TRUE(mBrowserWindow, NS_OK);
char *buf = nsnull;
nsCAutoString buf;
if (location)
location->GetSpec(&buf);
location->GetSpec(buf);
nsAutoString tmp; tmp.AssignWithConversion(buf);
nsAutoString tmp;
CopyUTF8toUTF16(buf, tmp);
mBrowserWindow->SetLocation(tmp);
if (buf)
Recycle(buf);
return NS_OK;
}