equal
deleted
inserted
replaced
153 with Files("**"): |
153 with Files("**"): |
154 BUG_COMPONENT = ("Toolkit", "Downloads API") |
154 BUG_COMPONENT = ("Toolkit", "Downloads API") |
155 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs b/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
155 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs b/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
156 --- a/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
156 --- a/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
157 +++ b/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
157 +++ b/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs |
158 @@ -1241,36 +1241,66 @@ nsUnknownContentTypeDialog.prototype = { |
158 @@ -1227,36 +1227,66 @@ nsUnknownContentTypeDialog.prototype = { |
159 params.handlerApp && |
159 params.handlerApp && |
160 params.handlerApp.executable && |
160 params.handlerApp.executable && |
161 params.handlerApp.executable.isFile() |
161 params.handlerApp.executable.isFile() |
162 ) { |
162 ) { |
163 // Remember the file they chose to run. |
163 // Remember the file they chose to run. |
236 + } |
236 + } |
237 } else { |
237 } else { |
238 var nsIFilePicker = Ci.nsIFilePicker; |
238 var nsIFilePicker = Ci.nsIFilePicker; |
239 var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); |
239 var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); |
240 fp.init( |
240 fp.init( |
241 this.mDialog, |
241 this.mDialog.browsingContext, |
242 this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
242 this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
243 nsIFilePicker.modeOpen |
243 nsIFilePicker.modeOpen |
244 ); |
244 ); |
245 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
245 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
246 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
246 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
281 |
281 |
282 NS_IMETHODIMP |
282 NS_IMETHODIMP |
283 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
283 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
284 // dbus prevents us from being threadsafe, but this routine should not block |
284 // dbus prevents us from being threadsafe, but this routine should not block |
285 // anyhow |
285 // anyhow |
286 @@ -388,21 +392,46 @@ nsresult nsUnixSystemProxySettings::GetP |
286 @@ -388,24 +392,49 @@ nsresult nsUnixSystemProxySettings::GetP |
287 return NS_OK; |
287 return NS_OK; |
288 } |
288 } |
289 |
289 |
290 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
290 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
291 const nsACString& aScheme, |
291 const nsACString& aScheme, |
323 + return NS_ERROR_FAILURE; |
323 + return NS_ERROR_FAILURE; |
324 + aResult = result[0]; |
324 + aResult = result[0]; |
325 + return NS_OK; |
325 + return NS_OK; |
326 +} |
326 +} |
327 + |
327 + |
|
328 NS_IMETHODIMP |
|
329 nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) { |
|
330 *aSystemWPADSetting = false; |
|
331 return NS_OK; |
|
332 } |
|
333 |
328 NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) { |
334 NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) { |
329 auto result = MakeRefPtr<nsUnixSystemProxySettings>(); |
335 auto result = MakeRefPtr<nsUnixSystemProxySettings>(); |
330 result->Init(); |
|
331 return result.forget().downcast<nsISupports>(); |
|
332 } |
|
333 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
336 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
334 --- a/toolkit/xre/moz.build |
337 --- a/toolkit/xre/moz.build |
335 +++ b/toolkit/xre/moz.build |
338 +++ b/toolkit/xre/moz.build |
336 @@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
339 @@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
337 "../components/printingui", |
340 "../components/printingui", |