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

chore: bump chromium to 63be48daea281d4f8c834c2e707a7 (master) (#19923)

Browse source
This commit is contained in:
Electron Bot 2019-09-18 15:58:00 -04:00 • committed by Jeremy Apthorp
parent 104088b86b
commit eb2d2264d0
124 changed files with 1736 additions and 1410 deletions
Download patch file Download diff file Expand all files Collapse all files

30
patches/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 26ec105bf873bd0e802c2c7e65e5e82f2abcfd85..b5e94e434ad7c22de2b59ae1bd0640d55da690a2 100644
index 887cdd11fbbd9df44edef1548a89891c5cf23cee..12da72449622289ec467d284f616bbf937ff1865 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,16 +13,20 @@
@ -39,19 +39,7 @@ index 26ec105bf873bd0e802c2c7e65e5e82f2abcfd85..b5e94e434ad7c22de2b59ae1bd0640d5
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -64,6 +68,7 @@ void RecordSecurityLevel(
}
}
+#if 0
security_state::SafetyTipStatus GetSecurityStateSafetyTipType(
safety_tips::SafetyTipType type) {
switch (type) {
@@ -76,11 +81,13 @@ security_state::SafetyTipStatus GetSecurityStateSafetyTipType(
return security_state::SafetyTipStatus::SAFETY_TIP_STATUS_NONE;
}
}
+#endif
@@ -66,8 +70,9 @@ void RecordSecurityLevel(
} // namespace
@ -62,7 +50,7 @@ index 26ec105bf873bd0e802c2c7e65e5e82f2abcfd85..b5e94e434ad7c22de2b59ae1bd0640d5
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -102,6 +109,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
@@ -89,6 +94,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
// information is still being initialized, thus no need to check for that.
state->malicious_content_status = GetMaliciousContentStatus();
@ -70,15 +58,15 @@ index 26ec105bf873bd0e802c2c7e65e5e82f2abcfd85..b5e94e434ad7c22de2b59ae1bd0640d5
safety_tips::ReputationWebContentsObserver* reputation_web_contents_observer =
safety_tips::ReputationWebContentsObserver::FromWebContents(
web_contents());
@@ -110,6 +118,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
? GetSecurityStateSafetyTipType(
reputation_web_contents_observer->last_shown_safety_tip_type())
: security_state::SafetyTipStatus::SAFETY_TIP_STATUS_NONE;
@@ -97,6 +103,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
? reputation_web_contents_observer
->GetSafetyTipStatusForVisibleNavigation()
: security_state::SafetyTipStatus::kUnknown;
+#endif
return state;
}
@@ -176,6 +185,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -164,6 +171,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -86,7 +74,7 @@ index 26ec105bf873bd0e802c2c7e65e5e82f2abcfd85..b5e94e434ad7c22de2b59ae1bd0640d5
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -254,6 +264,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -242,6 +250,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}