Commit 5bb9f6a1 authored by Tatiana Meshkova's avatar Tatiana Meshkova

Updated to latest upstream merge

parent 69ce7e14
......@@ -119,7 +119,7 @@ EmbedChromeListener::HandleEvent(nsIDOMEvent* aEvent)
nsCOMPtr<nsIDOMHTMLLinkElement> disabledIface = do_QueryInterface(origTarget);
nsString href;
bool disabled = true;
disabledIface->GetDisabled(&disabled);
disabledIface->GetMozDisabled(&disabled);
if (!disabledIface || disabled) {
return NS_OK;
}
......
......@@ -75,7 +75,7 @@ let DownloadUIListener = {
dump("addDownload here\n")
var dl = Services.downloads.addDownload(Ci.nsIDownloadManager.DOWNLOAD_TYPE_DOWNLOAD,
ios.newURI(data.from, null, null),
ios.newURI(data.to, null, null),
null,
null, null, Math.round(Date.now() * 1000), null, persist, false);
persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
......
......@@ -41,7 +41,7 @@ NS_IMETHODIMP nsEmbedAlertsService::ShowAlertNotification(const nsAString & aIma
const nsAString & aAlertText, bool aAlertTextClickable,
const nsAString & aAlertCookie,
nsIObserver * aAlertListener,
const nsAString & aAlertName)
const nsAString & aAlertName, const nsAString & dir, const nsAString & lang)
{
printf(">>>>>>Func:%s::%d image:%s, title:%s, text:%s, clickable:%i, cookie:%s, listener:%p, name:%s\n", __PRETTY_FUNCTION__, __LINE__,
NS_ConvertUTF16toUTF8(aImageUrl).get(),
......@@ -60,6 +60,13 @@ NS_IMETHODIMP nsEmbedAlertsService::ShowAlertNotification(const nsAString & aIma
return NS_OK;
}
NS_IMETHODIMP nsEmbedAlertsService::CloseAlert(const nsAString & name)
{
printf("nsEmbedAlertsService::CloseAlert: name:%s", NS_ConvertUTF16toUTF8(name).get());
return NS_OK;
}
NS_IMETHODIMP nsEmbedAlertsService::OnProgress(const nsAString & aAlertName,
int64_t aProgress,
int64_t aProgressMax,
......
......@@ -311,3 +311,17 @@ nsEmbedFilePicker::OnMessageReceived(const char* messageName, const PRUnichar* m
return NS_OK;
}
NS_IMETHODIMP
nsEmbedFilePicker::GetDomfile(nsIDOMFile * *aDomfile)
{
printf("nsEmbedFilePicker::GetDomfile NOT IMPLEMENTED\n");
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsEmbedFilePicker::GetDomfiles(nsISimpleEnumerator * *aDomfiles)
{
printf("nsEmbedFilePicker::GetDomfiles NOT IMPLEMENTED\n");
return NS_ERROR_NOT_IMPLEMENTED;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment