Back out chak's changes to mfcembed until we can separate the PSM stuff out.
This commit is contained in:
Родитель
ce058cb2e6
Коммит
2799085e3a
|
@ -67,7 +67,6 @@
|
|||
#include "BrowserImpl.h"
|
||||
#include "BrowserFrm.h"
|
||||
#include "Dialogs.h"
|
||||
#include "SecurityInfoDlg.h"
|
||||
|
||||
// Print Includes
|
||||
#include "PrintProgressDialog.h"
|
||||
|
@ -1043,13 +1042,5 @@ void CBrowserView::ShowSecurityInfo()
|
|||
return;
|
||||
}
|
||||
|
||||
nsresult rv = NS_OK;
|
||||
nsCOMPtr<nsISSLStatus> sslStatus = do_GetInterface(mWebBrowser, &rv);
|
||||
if (NS_FAILED(rv)) {
|
||||
::MessageBox(hParent, "Unable to get nsISSLStatus", "MfcEmbed", MB_OK);
|
||||
return;
|
||||
}
|
||||
|
||||
SecurityInfoDlg dlg(sslStatus, this);
|
||||
dlg.DoModal();
|
||||
::MessageBox(hParent, "To Be Done..........", "MfcEmbed", MB_OK);
|
||||
}
|
||||
|
|
|
@ -349,42 +349,6 @@ BEGIN
|
|||
EDITTEXT IDC_EDIT_HOMEPAGE,53,95,211,14,ES_AUTOHSCROLL
|
||||
END
|
||||
|
||||
IDD_SECURITY_INFO_DIALOG DIALOG DISCARDABLE 0, 0, 248, 119
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Security Information"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
CTEXT "",IDC_ENCRYPTION,37,7,174,13,SS_CENTERIMAGE | SS_SUNKEN
|
||||
LTEXT "This page was encrypted. This means it was difficult for other people to view this page when it was loaded.\n\nYou can examine your copy of the certificate for this page and check the identity of the web site.",
|
||||
IDC_STATIC,3,27,239,41
|
||||
LTEXT "To see the certificate for this web site, click View Certificate.",
|
||||
IDC_STATIC,5,78,233,8
|
||||
PUSHBUTTON "View Certificate",IDC_VIEW_CERT,66,99,57,14
|
||||
DEFPUSHBUTTON "OK",IDOK,132,99,50,14
|
||||
END
|
||||
|
||||
IDD_VIEWCERT_DIALOG DIALOG DISCARDABLE 0, 0, 347, 175
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Certificate Information"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,147,154,50,14
|
||||
LTEXT "This Certificate was issued by:",IDC_STATIC,5,9,96,8
|
||||
LTEXT "",IDC_CERT_OWNER,197,24,143,44
|
||||
LTEXT "This Certificate belongs to:",IDC_STATIC,187,9,84,8
|
||||
LTEXT "",IDC_CERT_ISSUER,13,24,143,44
|
||||
LTEXT "Serial Number:",IDC_STATIC,5,75,47,8
|
||||
LTEXT "",IDC_CERT_SERIAL,57,75,282,8
|
||||
LTEXT "Date Issued:",IDC_STATIC,5,90,41,8
|
||||
LTEXT "",IDC_CERT_ISSUE_DATE,57,90,282,8
|
||||
LTEXT "Date Expires:",IDC_STATIC,5,105,43,8
|
||||
LTEXT "",IDC_CERT_EXPIRY_DATE,57,105,282,8
|
||||
LTEXT "SHA1 Fingerprint:",IDC_STATIC,5,120,56,8
|
||||
LTEXT "",IDC_CERT_SHA1_FINGERPRINT,70,120,269,8
|
||||
LTEXT "MD5 Fingerprint:",IDC_STATIC,5,135,53,8
|
||||
LTEXT "",IDC_CERT_MD5_FINGERPRINT,70,135,269,8
|
||||
END
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
|
@ -102,15 +102,12 @@
|
|||
#include "nsIEmbeddingSiteWindow.h"
|
||||
#include "nsIWebBrowserFind.h"
|
||||
#include "nsIWebBrowserFocus.h"
|
||||
|
||||
|
||||
// Printer Includes
|
||||
#include "nsIPrintOptions.h"
|
||||
#include "nsIWebBrowserPrint.h"
|
||||
#include "nsIDOMWindow.h"
|
||||
|
||||
// SSL Includes
|
||||
#include "nsISSLStatus.h"
|
||||
|
||||
//{{AFX_INSERT_LOCATION}}
|
||||
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
|
||||
|
||||
|
|
|
@ -67,7 +67,6 @@ OBJS = \
|
|||
.\$(OBJDIR)\MostRecentUrls.obj \
|
||||
.\$(OBJDIR)\PrintProgressDialog.obj \
|
||||
.\$(OBJDIR)\Preferences.obj \
|
||||
.\$(OBJDIR)\SecurityInfoDlg.obj \
|
||||
.\$(OBJDIR)\StdAfx.obj \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -146,10 +146,6 @@ SOURCE=.\ProfilesDlg.cpp
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SecurityInfoDlg.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\StdAfx.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -210,10 +206,6 @@ SOURCE=.\resource.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SecurityInfoDlg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\StdAfx.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
@ -25,8 +25,6 @@
|
|||
#define IDS_ENCRYPTION_HIGH_GRADE 147
|
||||
#define IDS_ENCRYPTION_LOW_GRADE 148
|
||||
#define IDS_ENCRYPTION_NONE 149
|
||||
#define IDD_SECURITY_INFO_DIALOG 150
|
||||
#define IDD_VIEWCERT_DIALOG 151
|
||||
#define ID_URL_BAR 1001
|
||||
#define ID_PROG_BAR 1002
|
||||
#define IDC_PROMPT_ANSWER 1003
|
||||
|
@ -55,15 +53,6 @@
|
|||
#define IDC_RADIO_BLANK_PAGE 1153
|
||||
#define IDC_RADIO_HOME_PAGE 1154
|
||||
#define IDC_EDIT_HOMEPAGE 1155
|
||||
#define IDC_VIEW_CERT 1156
|
||||
#define IDC_CERT_OWNER 1157
|
||||
#define IDC_CERT_ISSUER 1158
|
||||
#define IDC_CERT_SERIAL 1159
|
||||
#define IDC_CERT_ISSUE_DATE 1160
|
||||
#define IDC_CERT_EXPIRY_DATE 1161
|
||||
#define IDC_CERT_SHA1_FINGERPRINT 1162
|
||||
#define IDC_CERT_MD5_FINGERPRINT 1163
|
||||
#define IDC_ENCRYPTION 1164
|
||||
#define ID_NAV_BACK 32773
|
||||
#define ID_NAV_FORWARD 32774
|
||||
#define ID_NAV_HOME 32775
|
||||
|
|
Загрузка…
Ссылка в новой задаче