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

chore: bump chromium to 74.0.3729.27 (master) (#17345)

Browse source 
* chore: bump chromium to 74.0.3729.5 (master)

* Remove ScopedBlockingCall constructor without location

1496560

* Use XCode 9.4.1 for Mac SDK 10.13

* chore: roll chromium 74.0.3729.27
This commit is contained in:
Jeremy Apthorp 2019-03-21 08:45:22 -07:00 • committed by John Kleinschmidt
parent 07b02653ba
commit 6555be2636
48 changed files with 170 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

16
patches/common/chromium/ssl_security_state_tab_helper.patch
View file

@ -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 d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8db3d5937 100644
index 4c1b8bda5a8dbd52d0047e8945490d25c21a3164..2fcc2f9a2b233223b99d67df0f2ecaf02b464ae7 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -12,10 +12,12 @@
@ -22,7 +22,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/secure_origin_whitelist.h"
@@ -41,7 +43,7 @@
@@ -42,7 +44,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -31,7 +31,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -77,7 +79,9 @@ bool IsOriginSecureWithWhitelist(
@@ -78,7 +80,9 @@ bool IsOriginSecureWithWhitelist(
} // namespace
@ -41,7 +41,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -137,6 +141,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -138,6 +142,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -49,7 +49,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
// Security indicator UI study (https://crbug.com/803501): Show a message in
// the console to reduce developer confusion about the experimental UI
// treatments for HTTPS pages with EV certificates.
@@ -164,6 +169,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -165,6 +170,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid.");
}
}
@ -57,7 +57,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -189,6 +195,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -190,6 +196,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -65,7 +65,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -256,6 +263,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -257,6 +264,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}
@ -73,7 +73,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
@@ -274,15 +282,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
@@ -275,15 +283,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
const {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();