Bug 1834938 - Refresh uriloader/exthandler/uikit to match changed method signatures. r=Gijs

Also fix warnings about missing override annotations.

Differential Revision: https://phabricator.services.mozilla.com/D179017

uriloader/exthandler/uikit/nsLocalHandlerAppUIKit.h

@@ -20,8 +20,8 @@ class nsLocalHandlerAppUIKit final : public nsLocalHandlerApp {
   nsLocalHandlerAppUIKit(const nsAString& aName, nsIFile* aExecutable)
       : nsLocalHandlerApp(aName, aExecutable) {}
 
-  NS_IMETHOD LaunchWithURI(nsIURI* aURI,
-                           BrowsingContext* aBrowsingContext) override;
+  NS_IMETHOD LaunchWithURI(
+      nsIURI* aURI, mozilla::dom::BrowsingContext* aBrowsingContext) override;
 };
 
 #endif /* nslocalhandlerappuikit_h_ */

uriloader/exthandler/uikit/nsLocalHandlerAppUIKit.mm

@@ -10,6 +10,7 @@
 #include "nsIURI.h"
 
 NS_IMETHODIMP
-nsLocalHandlerAppUIKit::LaunchWithURI(nsIURI* aURI, nsIInterfaceRequestor* aWindowContext) {
+nsLocalHandlerAppUIKit::LaunchWithURI(nsIURI* aURI,
+                                      mozilla::dom::BrowsingContext* aBrowsingContext) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }

uriloader/exthandler/uikit/nsMIMEInfoUIKit.h

@@ -19,9 +19,9 @@ class nsMIMEInfoUIKit final : public nsMIMEInfoImpl {
   NS_IMETHOD LaunchWithFile(nsIFile* aFile) override;
 
  protected:
-  virtual nsresult LoadUriInternal(nsIURI* aURI);
+  virtual nsresult LoadUriInternal(nsIURI* aURI) override;
 #ifdef DEBUG
-  virtual nsresult LaunchDefaultWithFile(nsIFile* aFile) {
+  virtual nsresult LaunchDefaultWithFile(nsIFile* aFile) override {
     MOZ_ASSERT_UNREACHABLE("do not call this method, use LaunchWithFile");
     return NS_ERROR_UNEXPECTED;
   }

uriloader/exthandler/uikit/nsOSHelperAppService.h

@@ -23,20 +23,20 @@ class nsOSHelperAppService final : public nsExternalHelperAppService {
 
   // override nsIExternalProtocolService methods
   NS_IMETHOD GetApplicationDescription(const nsACString& aScheme,
-                                       nsAString& _retval);
+                                       nsAString& _retval) override;
   NS_IMETHOD IsCurrentAppOSDefaultForProtocol(const nsACString& aScheme,
-                                              bool* _retval);
+                                              bool* _retval) override;
 
   // method overrides --> used to hook the mime service into internet config....
   NS_IMETHOD GetFromTypeAndExtension(const nsACString& aType,
                                      const nsACString& aFileExt,
-                                     nsIMIMEInfo** aMIMEInfo);
+                                     nsIMIMEInfo** aMIMEInfo) override;
   NS_IMETHOD GetMIMEInfoFromOS(const nsACString& aMIMEType,
                                const nsACString& aFileExt, bool* aFound,
                                nsIMIMEInfo** aMIMEInfo) override;
   NS_IMETHOD GetProtocolHandlerInfoFromOS(const nsACString& aScheme,
                                           bool* found,
-                                          nsIHandlerInfo** _retval);
+                                          nsIHandlerInfo** _retval) override;
 
   // GetFileTokenForPath must be implemented by each platform.
   // platformAppPath --> a platform specific path to an application that we got
@@ -45,7 +45,7 @@ class nsOSHelperAppService final : public nsExternalHelperAppService {
   //                     platform
   // aFile --> an nsIFile representation of that platform application path.
   virtual nsresult GetFileTokenForPath(const char16_t* platformAppPath,
-                                       nsIFile** aFile);
+                                       nsIFile** aFile) override;
 
   nsresult OSProtocolHandlerExists(const char* aScheme,
                                    bool* aHandlerExists) override;

uriloader/exthandler/uikit/nsOSHelperAppService.mm

@@ -46,7 +46,7 @@ NS_IMETHODIMP nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMETyp
 }
 
 NS_IMETHODIMP
-nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const char* aScheme, bool* found,
+nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString& aScheme, bool* found,
                                                    nsIHandlerInfo** _retval) {
   *found = false;
   return NS_OK;