chore: update patches
This commit is contained in:
parent
b820b4078d
commit
55e50a0879
63 changed files with 487 additions and 502 deletions
|
@ -6,7 +6,7 @@ Subject: ssl_security_state_tab_helper.patch
|
|||
Allows populating security tab info for devtools in Electron.
|
||||
|
||||
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb7538e1a7cf7 100644
|
||||
index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fadbfeeb797 100644
|
||||
--- a/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
|
@ -17,7 +17,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
#include "base/feature_list.h"
|
||||
#include "base/metrics/field_trial_params.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
@@ -14,25 +15,29 @@
|
||||
@@ -14,24 +15,28 @@
|
||||
#include "base/strings/string_util.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
|
@ -29,7 +29,6 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
#include "chrome/browser/safe_browsing/ui_manager.h"
|
||||
#include "chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h"
|
||||
+#endif
|
||||
#include "chrome/browser/ssl/tls_deprecation_config.h"
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
|
@ -48,7 +47,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
#include "components/security_state/content/content_utils.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/navigation_entry.h"
|
||||
@@ -55,7 +60,7 @@
|
||||
@@ -54,7 +59,7 @@
|
||||
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
@ -57,7 +56,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
|
||||
#endif
|
||||
|
||||
@@ -99,9 +104,12 @@ bool IsLegacyTLS(GURL url, int connection_status) {
|
||||
@@ -98,9 +103,12 @@ bool IsLegacyTLS(GURL url, int connection_status) {
|
||||
// default we treat TLS < 1.2 as Legacy, unless the "SSLVersionMin" policy is
|
||||
// set.
|
||||
std::string ssl_version_min_str = switches::kSSLVersionTLSv12;
|
||||
|
@ -73,7 +72,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
}
|
||||
|
||||
// Convert the pref string to an SSLVersion, if it is valid. Otherwise use the
|
||||
@@ -121,8 +129,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
|
||||
@@ -120,8 +128,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
|
||||
|
||||
} // namespace
|
||||
|
||||
|
@ -84,7 +83,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
|
||||
SecurityStateTabHelper::SecurityStateTabHelper(
|
||||
content::WebContents* web_contents)
|
||||
@@ -168,6 +177,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
|
||||
@@ -150,6 +159,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
|
||||
// information is still being initialized, thus no need to check for that.
|
||||
state->malicious_content_status = GetMaliciousContentStatus();
|
||||
|
||||
|
@ -92,7 +91,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
ReputationWebContentsObserver* reputation_web_contents_observer =
|
||||
ReputationWebContentsObserver::FromWebContents(web_contents());
|
||||
state->safety_tip_info =
|
||||
@@ -192,6 +202,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
|
||||
@@ -174,6 +184,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -100,7 +99,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
return state;
|
||||
}
|
||||
|
||||
@@ -254,8 +265,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
|
||||
@@ -236,8 +247,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
|
||||
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
|
||||
}
|
||||
|
||||
|
@ -111,7 +110,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
}
|
||||
|
||||
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
|
||||
@@ -279,6 +292,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
@@ -261,6 +274,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
web_contents()->GetController().GetVisibleEntry();
|
||||
if (!entry)
|
||||
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
|
||||
|
@ -119,7 +118,7 @@ index 70491781c7c97a86a3469b3a6954b579156f164d..813ebf8fc088822e7d17d0fbe4aeb753
|
|||
safe_browsing::SafeBrowsingService* sb_service =
|
||||
g_browser_process->safe_browsing_service();
|
||||
if (!sb_service)
|
||||
@@ -361,6 +375,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
@@ -343,6 +357,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue