diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 0572abe547a0..82dc90e2960e 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -192,29 +192,6 @@ var gIdentityHandler = {
let wrapper = document.getElementById("template-identity-popup");
wrapper.replaceWith(wrapper.content);
this._popupInitialized = true;
-
- if (this._protonEnabled) {
- // When proton is enabled, we need to place the security section
- // within a toolbarbutton.
- let button = document.createXULElement("toolbarbutton");
- button.id = "identity-popup-security-button";
- button.classList.add("subviewbutton-nav", "subviewbutton");
- button.setAttribute("align", "center");
- this.showSecuritySubView = this.showSecuritySubView.bind(this);
- button.addEventListener("command", this.showSecuritySubView);
- button.appendChild(
- document
- .getElementById("identity-popup-security")
- .querySelector(".identity-popup-security-connection")
- );
-
- this._identityPopupMainView.insertBefore(
- button,
- this._identityPopupMainView.querySelector("toolbarseparator")
- .nextSibling
- );
- this._popupExpander.hidden = true;
- }
}
},
@@ -418,16 +395,6 @@ var gIdentityHandler = {
);
return this._useGrayLockIcon;
},
- get _protonEnabled() {
- delete this._protonEnabled;
- XPCOMUtils.defineLazyPreferenceGetter(
- this,
- "_protonEnabled",
- "browser.proton.doorhangers.enabled",
- false
- );
- return this._protonEnabled;
- },
/**
* Handles clicks on the "Clear Cookies and Site Data" button.
@@ -1015,17 +982,6 @@ var gIdentityHandler = {
connection = "file";
}
- if (this._protonEnabled) {
- document.getElementById("identity-popup-security-button").disabled = ![
- "not-secure",
- "secure",
- "secure-ev",
- "secure-cert-user-overridden",
- "cert-error-page",
- "https-only-error-page",
- ].includes(connection);
- }
-
// Determine the mixed content state.
let mixedcontent = [];
if (this._isMixedPassiveContentLoaded) {
@@ -1141,20 +1097,16 @@ var gIdentityHandler = {
}
// Push the appropriate strings out to the UI.
- document.l10n.setAttributes(
- this._identityPopupMainViewHeaderLabel,
- "identity-site-information",
- {
- host,
- }
+ this._identityPopupMainViewHeaderLabel.textContent = gNavigatorBundle.getFormattedString(
+ "identity.headerMainWithHost",
+ [host]
);
- document.l10n.setAttributes(
- this._identityPopupSecurityView,
- "identity-header-security-with-host",
- {
+ this._identityPopupSecurityView.setAttribute(
+ "title",
+ gNavigatorBundle.getFormattedString("identity.headerSecurityWithHost", [
host,
- }
+ ])
);
this._identityPopupSecurityEVContentOwner.textContent = gNavigatorBundle.getFormattedString(
diff --git a/browser/base/content/test/siteIdentity/browser_check_identity_state.js b/browser/base/content/test/siteIdentity/browser_check_identity_state.js
index da55d20d1100..b9288e238746 100644
--- a/browser/base/content/test/siteIdentity/browser_check_identity_state.js
+++ b/browser/base/content/test/siteIdentity/browser_check_identity_state.js
@@ -38,18 +38,12 @@ function getSecurityConnectionBG() {
.getPropertyValue("background-image");
}
-async function getReaderModeURL() {
+function getReaderModeURL() {
// Gets the reader mode URL from "identity-popup mainView panel header span"
document.getElementById("identity-icon-box").click();
gIdentityHandler.refreshIdentityPopup();
-
- let headerSpan = document.getElementById(
- "identity-popup-mainView-panel-header-span"
- );
- await BrowserTestUtils.waitForCondition(() =>
- headerSpan.innerHTML.includes("example.com")
- );
- return headerSpan.innerHTML;
+ return document.getElementById("identity-popup-mainView-panel-header-span")
+ .innerHTML;
}
// This test is slow on Linux debug e10s
@@ -587,10 +581,10 @@ async function readerUriTest(secureCheck) {
let newTab = await loadNewTab("about:reader?url=http://example.com");
gBrowser.selectedTab = newTab;
- let readerURL = await getReaderModeURL();
+ let readerURL = getReaderModeURL();
is(
readerURL,
- "Site information for example.com",
+ "Site Information for example.com",
"should be the correct URI in reader mode"
);
diff --git a/browser/base/content/test/siteIdentity/browser_identityPopup_focus.js b/browser/base/content/test/siteIdentity/browser_identityPopup_focus.js
index 84d3b9eb4946..daf7d89e80ff 100644
--- a/browser/base/content/test/siteIdentity/browser_identityPopup_focus.js
+++ b/browser/base/content/test/siteIdentity/browser_identityPopup_focus.js
@@ -48,11 +48,7 @@ add_task(async function testIdentityPopupFocusKeyboard() {
await shown;
is(
Services.focus.focusedElement,
- document.getElementById(
- gProtonDoorhangers
- ? "identity-popup-security-button"
- : "identity-popup-security-expander"
- )
+ document.getElementById("identity-popup-security-expander")
);
});
});
@@ -74,11 +70,7 @@ add_task(async function testSiteSecurityTabOrder() {
await shown;
is(
Services.focus.focusedElement,
- document.getElementById(
- gProtonDoorhangers
- ? "identity-popup-security-button"
- : "identity-popup-security-expander"
- )
+ document.getElementById("identity-popup-security-expander")
);
// 2. Access the Site Security section.
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index 8875b2ac8d0b..533f499245e5 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -23,13 +23,12 @@
-
-