From cfe5ef4ac7cd59f094b538252161ad74223c47da Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 May 2018 11:09:44 +0200 Subject: Remove Gonk build directories --- uriloader/exthandler/gonk/nsOSHelperAppService.cpp | 56 ---------------------- uriloader/exthandler/gonk/nsOSHelperAppService.h | 39 --------------- uriloader/exthandler/moz.build | 2 +- 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 uriloader/exthandler/gonk/nsOSHelperAppService.cpp delete mode 100644 uriloader/exthandler/gonk/nsOSHelperAppService.h (limited to 'uriloader/exthandler') diff --git a/uriloader/exthandler/gonk/nsOSHelperAppService.cpp b/uriloader/exthandler/gonk/nsOSHelperAppService.cpp deleted file mode 100644 index d1342ec18..000000000 --- a/uriloader/exthandler/gonk/nsOSHelperAppService.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- */ -/* Copyright 2012 Mozilla Foundation and Mozilla contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "nsOSHelperAppService.h" -#include "nsMIMEInfoImpl.h" - -class nsGonkMIMEInfo : public nsMIMEInfoImpl { -public: - nsGonkMIMEInfo(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) { } - -protected: - virtual nsresult LoadUriInternal(nsIURI *aURI) { - return NS_ERROR_NOT_IMPLEMENTED; - } -}; - -nsOSHelperAppService::nsOSHelperAppService() : nsExternalHelperAppService() -{ -} - -nsOSHelperAppService::~nsOSHelperAppService() -{ -} - -already_AddRefed -nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMEType, - const nsACString& aFileExt, - bool* aFound) -{ - *aFound = false; - // Even if we return false for aFound, we need to return a working - // nsIMIMEInfo implementation that will be used by the caller. - RefPtr mimeInfo = new nsGonkMIMEInfo(aMIMEType); - return mimeInfo.forget(); -} - -nsresult -nsOSHelperAppService::OSProtocolHandlerExists(const char* aScheme, - bool* aExists) -{ - *aExists = false; - return NS_OK; -} diff --git a/uriloader/exthandler/gonk/nsOSHelperAppService.h b/uriloader/exthandler/gonk/nsOSHelperAppService.h deleted file mode 100644 index 99a280bfc..000000000 --- a/uriloader/exthandler/gonk/nsOSHelperAppService.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- */ -/* Copyright 2012 Mozilla Foundation and Mozilla contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef nsOSHelperAppService_h -#define nsOSHelperAppService_h - -#include "nsCExternalHandlerService.h" -#include "nsExternalHelperAppService.h" - -class nsOSHelperAppService : public nsExternalHelperAppService -{ -public: - nsOSHelperAppService(); - virtual ~nsOSHelperAppService(); - - virtual already_AddRefed - GetMIMEInfoFromOS(const nsACString& aMIMEType, - const nsACString& aFileExt, - bool* aFound); - - virtual MOZ_MUST_USE nsresult - OSProtocolHandlerExists(const char* aScheme, - bool* aExists); -}; - -#endif /* nsOSHelperAppService_h */ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 6a3ca08af..714b275f1 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -24,7 +24,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += ['win'] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': osdir = 'mac' -elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'uikit'): +elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'uikit'): osdir = CONFIG['MOZ_WIDGET_TOOLKIT'] else: osdir = 'unix' -- cgit v1.2.3