Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm, a=lmandel
authorDoug Turner <doug.turner@gmail.com>
Tue, 14 Oct 2014 20:57:00 +0200
changeset 225890 340cfd2affa7
parent 225889 cadb1112c8fb
child 225891 06d2090db817
push id4059
push userryanvm@gmail.com
push date2014-10-31 21:13 +0000
treeherdermozilla-beta@631a73cdbc91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm, lmandel
bugs1073134
milestone34.0
Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm, a=lmandel
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;