Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm
authorDoug Turner <doug.turner@gmail.com>
Tue, 14 Oct 2014 20:57:00 +0200
changeset 210688 95ff64741969a7353b27b1ecc279e0970abc2c50
parent 210687 fff0b523cfc459eace313f02f3f29a388308ac9a
child 210689 8f19523dc6bfdfabe28a62a5541e2338f5e7aae5
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjdm
bugs1073134
milestone36.0a1
Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm
toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
+++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
@@ -27,32 +27,35 @@ nsParentalControlsService::GetParentalCo
 {
   *aResult = mEnabled;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::GetBlockFileDownloadsEnabled(bool *aResult)
 {
-  return NS_ERROR_NOT_AVAILABLE;
+  *aResult = false;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::GetLoggingEnabled(bool *aResult)
 {
-  return NS_ERROR_NOT_AVAILABLE;
+  *aResult = false;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::Log(int16_t aEntryType,
                                bool blocked,
                                nsIURI *aSource,
                                nsIFile *aTarget)
 {
-  return NS_ERROR_NOT_AVAILABLE;
+  // silently drop on the floor
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::RequestURIOverride(nsIURI *aTarget,
                                               nsIInterfaceRequestor *aWindowContext,
                                               bool *_retval)
 {
   return NS_ERROR_NOT_AVAILABLE;