mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 00:05:36 +00:00
Bug 1358183 - Remove some unused PSM IDL constants and functions. r=keeler
MozReview-Commit-ID: C8EGosXvTQL --HG-- extra : rebase_source : 9c141f6750d7658409fc2820f17940abe067fb4a
This commit is contained in:
parent
52ed9fd77e
commit
d1803f67e9
@ -77,6 +77,4 @@ interface nsIPK11Token : nsISupports
|
||||
*/
|
||||
boolean isHardwareToken();
|
||||
boolean needsLogin();
|
||||
boolean isFriendly();
|
||||
};
|
||||
|
||||
|
@ -46,29 +46,29 @@ const uint32_t WARNING_CONFIRM_POST_TO_INSECURE_FROM_SECURE_CLICK_THROUGH = 10;
|
||||
* deprecated: we use the _TOP and _FRAME versions below
|
||||
*/
|
||||
|
||||
const uint32_t WARNING_MALWARE_PAGE = 13;
|
||||
const uint32_t WARNING_MALWARE_PAGE_WHY_BLOCKED = 14;
|
||||
const uint32_t WARNING_MALWARE_PAGE_GET_ME_OUT_OF_HERE = 15;
|
||||
const uint32_t WARNING_MALWARE_PAGE_IGNORE_WARNING = 16;
|
||||
// removed WARNING_MALWARE_PAGE = 13;
|
||||
// removed WARNING_MALWARE_PAGE_WHY_BLOCKED = 14;
|
||||
// removed WARNING_MALWARE_PAGE_GET_ME_OUT_OF_HERE = 15;
|
||||
// removed WARNING_MALWARE_PAGE_IGNORE_WARNING = 16;
|
||||
|
||||
const uint32_t WARNING_PHISHING_PAGE = 17;
|
||||
const uint32_t WARNING_PHISHING_PAGE_WHY_BLOCKED = 18;
|
||||
const uint32_t WARNING_PHISHING_PAGE_GET_ME_OUT_OF_HERE = 19;
|
||||
const uint32_t WARNING_PHISHING_PAGE_IGNORE_WARNING = 20;
|
||||
// removed WARNING_PHISHING_PAGE = 17;
|
||||
// removed WARNING_PHISHING_PAGE_WHY_BLOCKED = 18;
|
||||
// removed WARNING_PHISHING_PAGE_GET_ME_OUT_OF_HERE = 19;
|
||||
// removed WARNING_PHISHING_PAGE_IGNORE_WARNING = 20;
|
||||
|
||||
/*
|
||||
* SSL Error dialogs
|
||||
* deprecated: we use the _TOP versions below
|
||||
*/
|
||||
|
||||
const uint32_t WARNING_BAD_CERT = 21;
|
||||
const uint32_t WARNING_BAD_CERT_STS = 22;
|
||||
const uint32_t WARNING_BAD_CERT_CLICK_ADD_EXCEPTION = 23;
|
||||
const uint32_t WARNING_BAD_CERT_CLICK_VIEW_CERT = 24;
|
||||
const uint32_t WARNING_BAD_CERT_DONT_REMEMBER_EXCEPTION = 25;
|
||||
const uint32_t WARNING_BAD_CERT_GET_ME_OUT_OF_HERE = 27;
|
||||
const uint32_t WARNING_BAD_CERT_UNDERSTAND_RISKS = 28;
|
||||
const uint32_t WARNING_BAD_CERT_TECHINICAL_DETAILS = 29;
|
||||
// removed WARNING_BAD_CERT = 21;
|
||||
// removed WARNING_BAD_CERT_STS = 22;
|
||||
// removed WARNING_BAD_CERT_CLICK_ADD_EXCEPTION = 23;
|
||||
// removed WARNING_BAD_CERT_CLICK_VIEW_CERT = 24;
|
||||
// removed WARNING_BAD_CERT_DONT_REMEMBER_EXCEPTION = 25;
|
||||
// removed WARNING_BAD_CERT_GET_ME_OUT_OF_HERE = 27;
|
||||
// removed WARNING_BAD_CERT_UNDERSTAND_RISKS = 28;
|
||||
// removed WARNING_BAD_CERT_TECHINICAL_DETAILS = 29;
|
||||
|
||||
/*
|
||||
* Note that if we add more possibilities in the warning dialogs,
|
||||
|
@ -403,20 +403,6 @@ nsPK11Token::NeedsLogin(bool* _retval)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsPK11Token::IsFriendly(bool* _retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
|
||||
nsNSSShutDownPreventionLock locker;
|
||||
if (isAlreadyShutDown())
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
|
||||
*_retval = PK11_IsFriendly(mSlot.get());
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/*=========================================================*/
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsPK11TokenDB, nsIPK11TokenDB)
|
||||
|
@ -116,8 +116,6 @@ function run_test() {
|
||||
|
||||
ok(!token.isHardwareToken(),
|
||||
"The internal token should not be considered a hardware token");
|
||||
ok(token.isFriendly(),
|
||||
"The internal token should always be considered friendly");
|
||||
ok(token.needsLogin(),
|
||||
"The internal token should always need authentication");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user