mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 1a093e6a0cb5e72ba78990fe39824 (master) (#24575)

Browse source
This commit is contained in:
Electron Bot 2020-07-21 22:34:34 -07:00 • committed by GitHub
parent d4a4269989
commit 2fb14f53fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 407 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

27
patches/chromium/ssl_security_state_tab_helper.patch
View file

@ -6,10 +6,17 @@ 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 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b75230232 100644
index 16d1ca932afddc1f2502e99384141b0814beb75c..8370d59e30fac2a416879aa9798be43f72fd5d90 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,22 +13,26 @@
@@ -7,28 +7,33 @@
#include <string>
#include "base/bind.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
@ -37,7 +44,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
#include "components/security_state/content/content_utils.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h"
@@ -51,7 +55,7 @@
@@ -51,7 +56,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -46,7 +53,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -95,9 +99,12 @@ bool IsLegacyTLS(GURL url, int connection_status) {
@@ -95,9 +100,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;
@ -62,7 +69,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
}
// Convert the pref string to an SSLVersion, if it is valid. Otherwise use the
@@ -117,8 +124,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
@@ -117,8 +125,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
} // namespace
@ -73,7 +80,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -164,6 +172,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
@@ -164,6 +173,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
// information is still being initialized, thus no need to check for that.
state->malicious_content_status = GetMaliciousContentStatus();
@ -81,7 +88,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
ReputationWebContentsObserver* reputation_web_contents_observer =
ReputationWebContentsObserver::FromWebContents(web_contents());
state->safety_tip_info =
@@ -172,7 +181,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
@@ -172,7 +182,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
->GetSafetyTipInfoForVisibleNavigation()
: security_state::SafetyTipInfo(
{security_state::SafetyTipStatus::kUnknown, GURL()});
@ -90,7 +97,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
return state;
}
@@ -235,8 +244,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -235,8 +245,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -101,7 +108,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -260,6 +271,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -260,6 +272,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -109,7 +116,7 @@ index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -342,6 +354,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -342,6 +355,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}