remove *WithConversion from mac embedding code
261241 r=pink sr=darin git-svn-id: svn://10.0.0.236/trunk@163004 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7c12aabd2e
commit
fabaef24fb
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user