зеркало из https://github.com/mozilla/gecko-dev.git
Bug 682329: Remove workaround that mobile is using to suppress the cert error dialog box, r=mark.finkle
This commit is contained in:
Brian Smith
Родитель
631c3e67de
Коммит
175ae5237c
|
|
@ -64,7 +64,6 @@ XPIDL_MODULE = browsercomps
|
|||
XPIDLSRCS = nsIShellService.idl
|
||||
|
||||
CPPSRCS = \
|
||||
nsSSLCertErrorDialog.cpp \
|
||||
nsBrowserModule.cpp \
|
||||
nsShellService.cpp \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -40,23 +40,17 @@
|
|||
#include "mozilla/ModuleUtils.h"
|
||||
|
||||
#include "nsShellService.h"
|
||||
#include "nsSSLCertErrorDialog.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsShellService)
|
||||
NS_DEFINE_NAMED_CID(nsShellService_CID);
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSSLCertErrorDialog)
|
||||
NS_DEFINE_NAMED_CID(nsSSLCertErrorDialog_CID);
|
||||
|
||||
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
|
||||
{ &knsShellService_CID, false, NULL, nsShellServiceConstructor },
|
||||
{ &knsSSLCertErrorDialog_CID, false, NULL, nsSSLCertErrorDialogConstructor },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
|
||||
{ nsShellService_ContractID, &knsShellService_CID },
|
||||
{ nsSSLCertErrorDialog_ContractID, &knsSSLCertErrorDialog_CID },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/*
|
||||
* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (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.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mobile Browser SSL Cert Dialog Override.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* the Mozilla Foundation <http://www.mozilla.org/>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2011
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Mark Finkle <mfinkle@mozilla.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsSSLCertErrorDialog.h"
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLCertErrorDialog, nsISSLCertErrorDialog)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSSLCertErrorDialog::ShowCertError(nsIInterfaceRequestor *ctx,
|
||||
nsISSLStatus *status,
|
||||
nsIX509Cert *cert,
|
||||
const nsAString & textErrorMessage,
|
||||
const nsAString & htmlErrorMessage,
|
||||
const nsACString & hostName,
|
||||
PRUint32 portNumber)
|
||||
{
|
||||
/* Returning NS_OK here does not mean that this connection will continue
|
||||
* successfully. The connection has been or will be aborted regardless of
|
||||
* what we do here.
|
||||
*/
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/*
|
||||
* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (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.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mobile Browser SSL Cert Dialog Override.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* the Mozilla Foundation <http://www.mozilla.org/>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2011
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Mark Finkle <mfinkle@mozilla.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef __NS_SSLCERTERRORDIALOG_H__
|
||||
#define __NS_SSLCERTERRORDIALOG_H__
|
||||
|
||||
#include "nsISSLCertErrorDialog.h"
|
||||
|
||||
class nsSSLCertErrorDialog : public nsISSLCertErrorDialog
|
||||
{
|
||||
public:
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISSLCERTERRORDIALOG
|
||||
|
||||
nsSSLCertErrorDialog() {};
|
||||
~nsSSLCertErrorDialog() {};
|
||||
|
||||
};
|
||||
|
||||
#define nsSSLCertErrorDialog_CID \
|
||||
{ 0xb13f1121, 0xfa10, 0x4a7d, \
|
||||
{0x82, 0xe5, 0x31, 0x59, 0x9b, 0x89, 0x60, 0xb8} }
|
||||
|
||||
#define nsSSLCertErrorDialog_ContractID "@mozilla.org/nsSSLCertErrorDialog;1"
|
||||
|
||||
#endif
|
||||
Загрузка…
Ссылка в новой задаче