Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1063529 - should catch shell service exceptions, r=mconley

Browse Source 
--HG--
extra : rebase_source : f21763b563cdf5ed7936085d6bdfdb706b53778d
This commit is contained in:
Gijs Kruitbosch 2014-09-24 16:18:45 +01:00
parent c8227e3f8b
commit 5e105d364c
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/nsBrowserGlue.js
View File

@ -2163,7 +2163,11 @@ let DefaultBrowserCheck = {
claimAllTypes = (parseFloat(version) < 6.2);
} catch (ex) { }
#endif
ShellService.setDefaultBrowser(claimAllTypes, false);
try {
ShellService.setDefaultBrowser(claimAllTypes, false);
} catch (ex) {
Cu.reportError(ex);
}
this.closePrompt();
},

7
browser/components/preferences/in-content/main.js
View File

@ -648,7 +648,12 @@ var gMainPane = {
let shellSvc = getShellService();
if (!shellSvc)
return;
shellSvc.setDefaultBrowser(true, false);
try {
shellSvc.setDefaultBrowser(true, false);
} catch (ex) {
Cu.reportError(ex);
return;
}
let selectedIndex =
shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;

7
browser/components/preferences/main.js
View File

@ -500,7 +500,12 @@ var gMainPane = {
let shellSvc = getShellService();
if (!shellSvc)
return;
shellSvc.setDefaultBrowser(true, false);
try {
shellSvc.setDefaultBrowser(true, false);
} catch (ex) {
Components.utils.reportError(ex);
return;
}
let selectedIndex =
shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;