From 6907736c0d39094788ab9f82420f0d0f6a8de426 Mon Sep 17 00:00:00 2001 From: Gavin Sharp Date: Mon, 13 Oct 2014 21:10:47 -0700 Subject: [PATCH] Bug 1041516 part 1: clean up pref code in shell service, r=bsmedberg --HG-- extra : transplant_source : %B5%B9%11%7D%FE%86%85%7E%A5%10%11%5D%3B%1EZ%A4%B3%EF%0B%D8 --- .../components/shell/nsGNOMEShellService.cpp | 28 ++++++------- .../components/shell/nsMacShellService.cpp | 28 ++++++------- .../shell/nsWindowsShellService.cpp | 40 +++++++------------ 3 files changed, 40 insertions(+), 56 deletions(-) diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp index 2d6be344288a..defdbfc3b209 100644 --- a/browser/components/shell/nsGNOMEShellService.cpp +++ b/browser/components/shell/nsGNOMEShellService.cpp @@ -326,29 +326,25 @@ nsGNOMEShellService::GetShouldCheckDefaultBrowser(bool* aResult) return NS_OK; } - nsCOMPtr prefs; - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (pserve) - pserve->GetBranch("", getter_AddRefs(prefs)); + nsresult rv; + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } - if (prefs) - prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); - - return NS_OK; + return prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); } NS_IMETHODIMP nsGNOMEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) { - nsCOMPtr prefs; - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (pserve) - pserve->GetBranch("", getter_AddRefs(prefs)); + nsresult rv; + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } - if (prefs) - prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); - - return NS_OK; + return prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); } NS_IMETHODIMP diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp index c9351dbbc867..f6c8e294409a 100644 --- a/browser/components/shell/nsMacShellService.cpp +++ b/browser/components/shell/nsMacShellService.cpp @@ -90,7 +90,7 @@ nsMacShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers) return NS_ERROR_FAILURE; } } - + return NS_OK; } @@ -104,27 +104,25 @@ nsMacShellService::GetShouldCheckDefaultBrowser(bool* aResult) return NS_OK; } - nsCOMPtr prefs; - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (pserve) - pserve->GetBranch("", getter_AddRefs(prefs)); + nsresult rv; + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } - prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); - - return NS_OK; + return prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); } NS_IMETHODIMP nsMacShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) { - nsCOMPtr prefs; - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (pserve) - pserve->GetBranch("", getter_AddRefs(prefs)); + nsresult rv; + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } - prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); - - return NS_OK; + return prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); } NS_IMETHODIMP diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index edbba2ddc8f0..211c182d73f4 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -275,20 +275,15 @@ nsWindowsShellService::ShortcutMaintenance() return NS_ERROR_UNEXPECTED; NS_NAMED_LITERAL_CSTRING(prefName, "browser.taskbar.lastgroupid"); - nsCOMPtr prefs = + nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); if (!prefs) return NS_ERROR_UNEXPECTED; - nsCOMPtr prefBranch; - prefs->GetBranch(nullptr, getter_AddRefs(prefBranch)); - if (!prefBranch) - return NS_ERROR_UNEXPECTED; - nsCOMPtr prefString; - rv = prefBranch->GetComplexValue(prefName.get(), - NS_GET_IID(nsISupportsString), - getter_AddRefs(prefString)); + rv = prefs->GetComplexValue(prefName.get(), + NS_GET_IID(nsISupportsString), + getter_AddRefs(prefString)); if (NS_SUCCEEDED(rv)) { nsAutoString version; prefString->GetData(version); @@ -304,9 +299,9 @@ nsWindowsShellService::ShortcutMaintenance() return rv; prefString->SetData(appId); - rv = prefBranch->SetComplexValue(prefName.get(), - NS_GET_IID(nsISupportsString), - prefString); + rv = prefs->SetComplexValue(prefName.get(), + NS_GET_IID(nsISupportsString), + prefString); if (NS_FAILED(rv)) { NS_WARNING("Couldn't set last user model id!"); return NS_ERROR_UNEXPECTED; @@ -722,13 +717,11 @@ nsWindowsShellService::GetShouldCheckDefaultBrowser(bool* aResult) return NS_OK; } - nsCOMPtr prefs; nsresult rv; - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - rv = pserve->GetBranch("", getter_AddRefs(prefs)); - NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } return prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); } @@ -736,14 +729,11 @@ nsWindowsShellService::GetShouldCheckDefaultBrowser(bool* aResult) NS_IMETHODIMP nsWindowsShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) { - nsCOMPtr prefs; nsresult rv; - - nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - rv = pserve->GetBranch("", getter_AddRefs(prefs)); - NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (NS_FAILED(rv)) { + return rv; + } return prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); }