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

rebase chromium patches on M70

Browse source
This commit is contained in:
Jeremy Apthorp 2018-10-24 16:25:48 -07:00 • committed by deepak1556
parent 559fd5cb31
commit 3b4e706758
51 changed files with 234 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

18
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 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c6400f535 100644
index c88e2729738d28ba626e14dd95924522bca2c336..a017ea4b37a39f6d65636f3c1aecc43838b80d4f 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,17 +13,23 @@
@ -42,9 +42,9 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -81,7 +87,9 @@ bool IsOriginSecureWithWhitelist(
@@ -79,7 +85,9 @@ bool IsOriginSecureWithWhitelist(
DEFINE_WEB_CONTENTS_USER_DATA_KEY(SecurityStateTabHelper);
} // namespace
+#if 0
using safe_browsing::SafeBrowsingUIManager;
@ -52,7 +52,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -89,8 +97,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
@@ -87,8 +95,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
logged_http_warning_on_current_navigation_(false),
is_incognito_(false) {
content::BrowserContext* context = web_contents->GetBrowserContext();
@ -66,7 +66,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
is_incognito_ = true;
}
}
@@ -175,6 +186,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -173,6 +184,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -74,7 +74,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
// 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.
@@ -202,6 +214,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -200,6 +212,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid.");
}
}
@ -82,7 +82,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -275,6 +288,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -273,6 +286,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -90,7 +90,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -340,6 +354,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -341,6 +355,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}
@ -98,7 +98,7 @@ index 58066f3a532bf227f0445fe0d04a092e4ba6a4ff..a1643c6492e30b81a01105cc0c52483c
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
@@ -360,15 +375,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
@@ -361,15 +376,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
const {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();