bug 67527 -- cleaning up psm module registration (both psm 1.x and PIP). r=javi, sr=brendan.

This commit is contained in:
bryner%uiuc.edu 2001-02-06 23:10:16 +00:00
Родитель 8502112aa3
Коммит fa1a2642a1
7 изменённых файлов: 10 добавлений и 44 удалений

Просмотреть файл

@ -24,11 +24,6 @@
*/
%{C++
// Define CID {29a1d8b6-ac5a-11d4-9978-00b0d02354a0}
#define NS_ENTROPYCOLLECTOR_CID \
{ 0x29a1d8b6, 0xac5a, 0x11d4, \
{ 0x00, 0xb0, 0xd0, 0x23, 0x54, 0xa0 } }
/*
* If anyone wants to collect the entropy distributed by the
* event handler, they'll have to implement this CONTRACTID

Просмотреть файл

@ -32,6 +32,6 @@ interface nsIPSMUIHandler : nsISupports
};
%{C++
#define PSM_UI_HANLDER_CONTRACTID "@mozilla.org/psm/ui;1"
#define PSM_UI_HANLDER_CLASSNAME "Mozilla PSM UI Handler"
#define PSM_UI_HANDLER_CONTRACTID "@mozilla.org/psm/ui;1"
#define PSM_UI_HANDLER_CLASSNAME "Mozilla PSM UI Handler"
%}

Просмотреть файл

@ -95,9 +95,9 @@ static nsModuleComponentInfo components[] =
{
PSM_UI_HANLDER_CLASSNAME,
PSM_UI_HANDLER_CLASSNAME,
NS_PSMUIHANDLER_CID,
PSM_UI_HANLDER_CONTRACTID,
PSM_UI_HANDLER_CONTRACTID,
nsPSMUIHandlerImpl::CreatePSMUIHandler
},
@ -108,13 +108,6 @@ static nsModuleComponentInfo components[] =
nsSecureBrowserUIImpl::Create
},
{
NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME,
NS_SECURE_BROWSER_DOCOBSERVER_CID,
NS_SECURE_BROWSER_DOCOBSERVER_CONTRACTID,
nsSecureBrowserUIImpl::Create
},
{
NS_ISSLSOCKETPROVIDER_CLASSNAME,
NS_SSLSOCKETPROVIDER_CID,
@ -176,7 +169,7 @@ static nsModuleComponentInfo components[] =
},
{
"Entropy Collector",
NS_ENTROPYCOLLECTOR_CID,
NS_PSMCOMPONENT_CID,
NS_ENTROPYCOLLECTOR_CONTRACTID,
nsPSMComponent::CreatePSMComponent
}

Просмотреть файл

@ -42,14 +42,8 @@
#include "nsISecurityEventSink.h"
#include "nsWeakReference.h"
#define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer"
#define NS_SECURE_BROWSER_DOCOBSERVER_CID \
{0x97c06c30, 0xa145, 0x11d3, \
{0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
#define NS_SECURE_BROWSER_DOCOBSERVER_CONTRACTID "@mozilla.org/secure_browser_docobserver;1"
#define NS_SECURE_BROWSER_UI_CID \
{ 0x10fe7ea0, 0xa10a, 0x11d3, {0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
class nsSecureBrowserUIImpl : public nsSecureBrowserUI,
public nsIWebProgressListener,

Просмотреть файл

@ -37,8 +37,4 @@ interface nsSecureBrowserUI : nsISupports
%{C++
#define NS_SECURE_BROWSER_UI_CONTRACTID "@mozilla.org/secure_browser_ui;1"
#define NS_SECURE_BROWSER_UI_CLASSNAME "Mozilla Secure Browser UI Handler"
#define NS_SECURE_BROWSER_UI_CID \
{ 0x10fe7ea0, 0xa10a, 0x11d3, {0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
%}

Просмотреть файл

@ -91,13 +91,6 @@ static nsModuleComponentInfo components[] =
nsSecureBrowserUIImplConstructor
},
{
NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME,
NS_SECURE_BROWSER_DOCOBSERVER_CID,
NS_SECURE_BROWSER_DOCOBSERVER_CONTRACTID,
nsSecureBrowserUIImplConstructor
},
{
NS_ISSLSOCKETPROVIDER_CLASSNAME,
NS_SSLSOCKETPROVIDER_CID,
@ -128,7 +121,7 @@ static nsModuleComponentInfo components[] =
{
"Entropy Collector",
NS_ENTROPYCOLLECTOR_CID,
NS_NSSCOMPONENT_CID,
NS_ENTROPYCOLLECTOR_CONTRACTID,
nsNSSComponentConstructor
},

Просмотреть файл

@ -43,13 +43,8 @@
#include "nsISecurityEventSink.h"
#include "nsWeakReference.h"
#define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer"
#define NS_SECURE_BROWSER_DOCOBSERVER_CID \
{0x91003b94, 0x1dd2, 0x11b2, \
{0xaf, 0xc1, 0xc2, 0xc9, 0xc2, 0x15, 0x98, 0xf0}}
#define NS_SECURE_BROWSER_DOCOBSERVER_CONTRACTID "@mozilla.org/secure_browser_docobserver;1"
#define NS_SECURE_BROWSER_UI_CID \
{ 0xcc75499a, 0x1dd1, 0x11b2, {0x8a, 0x82, 0xca, 0x41, 0x0a, 0xc9, 0x07, 0xb8}}
class nsSecureBrowserUIImpl : public nsSecureBrowserUI,