Bug 1006051 - Follow-up: correct over-zealous regex replace. r=trivial
authorRichard Newman <rnewman@mozilla.com>
Wed, 23 Jul 2014 17:16:29 -0700
changeset 195846 0e21ce9682d85734ee8521e29d4a21eaedddaf53
parent 195845 d849aa6002c3cff535cdcf99a3a5aa86c6aa7ae8
child 195847 b16543ebbb4823b7ac0b2ddcd9683ba4296addfe
push id27198
push usercbook@mozilla.com
push dateThu, 24 Jul 2014 13:35:02 +0000
treeherdermozilla-central@616e6924cb0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial
bugs1006051
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1006051 - Follow-up: correct over-zealous regex replace. r=trivial
toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
+++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceCocoa.mm
@@ -47,21 +47,21 @@ nsParentalControlsService::Log(int16_t a
                                nsIURI *aSource,
                                nsIFile *aTarget)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::RequestURIOverride(nsIURI *aTarget,
-                                              nsIInterfaceRequestor *aCocoadowContext,
+                                              nsIInterfaceRequestor *aWindowContext,
                                               bool *_retval)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::RequestURIOverrides(nsIArray *aTargets,
-                                               nsIInterfaceRequestor *aCocoadowContext,
+                                               nsIInterfaceRequestor *aWindowContext,
                                                bool *_retval)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
+++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
@@ -42,21 +42,21 @@ nsParentalControlsService::Log(int16_t a
                                nsIURI *aSource,
                                nsIFile *aTarget)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::RequestURIOverride(nsIURI *aTarget,
-                                              nsIInterfaceRequestor *aCocoadowContext,
+                                              nsIInterfaceRequestor *aWindowContext,
                                               bool *_retval)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
 nsParentalControlsService::RequestURIOverrides(nsIArray *aTargets,
-                                               nsIInterfaceRequestor *aCocoadowContext,
+                                               nsIInterfaceRequestor *aWindowContext,
                                                bool *_retval)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }