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

chore: update patches/common/chromium

Browse source
This commit is contained in:
deepak1556 2019-01-16 23:37:52 +05:30
parent 2752ae4ae8
commit 3f75724a31
54 changed files with 328 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,12 +6,12 @@ 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 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70fff77fb858 100644
index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae5747fc994f 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,16 +13,20 @@
@@ -12,16 +12,20 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
+#if 0
#include "chrome/browser/browser_process.h"
@ -30,7 +30,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
#include "components/security_state/content/content_utils.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h"
@@ -43,7 +47,7 @@
@@ -42,7 +46,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -39,7 +39,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -79,7 +83,9 @@ bool IsOriginSecureWithWhitelist(
@@ -78,7 +82,9 @@ bool IsOriginSecureWithWhitelist(
} // namespace
@ -49,21 +49,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -87,8 +93,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
logged_http_warning_on_current_navigation_(false),
is_incognito_(false) {
content::BrowserContext* context = web_contents->GetBrowserContext();
- if (context->IsOffTheRecord() &&
- !Profile::FromBrowserContext(context)->IsGuestSession()) {
+ if (context->IsOffTheRecord()
+#if 0
+ && !Profile::FromBrowserContext(context)->IsGuestSession()
+#endif
+ ) {
is_incognito_ = true;
}
}
@@ -173,6 +182,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -138,6 +144,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -71,7 +57,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
// 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.
@@ -200,6 +210,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -165,6 +172,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid.");
}
}
@ -79,7 +65,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -273,6 +284,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -190,6 +198,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -87,7 +73,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -341,6 +353,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -259,6 +268,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}
@ -95,7 +81,7 @@ index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70ff
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
@@ -361,15 +374,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
@@ -277,15 +287,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
const {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();