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

chore: bump chromium to 964c4bca8de5c320534d95606c861 (master) (#18440)

Browse source 
* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1

* chore: update patches

* Revert "disable robotjs-based tests"

This reverts commit e56adafc1f.

* Revert "skip dbus tests (#18409)"

This reverts commit aea042cc83.

* Revert "skip more dbus tests"

This reverts commit 68dbef48da.

* chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605

* chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596

* chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774

* chore: update patches

* chore: update ssl_security_state_tab_helper.patch

* Remove content_packaged_services

1604203

* chore: fix false positive lint error

* views: wireup widget name to crash data

1626640

* chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861

* roll patches
This commit is contained in:
Electron Bot 2019-05-28 13:18:10 -07:00 • committed by Robo
parent c621615112
commit 96b32a814c
48 changed files with 207 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,10 @@ 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 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f500c44c96b 100644
index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a199f0ee15427b4ea45018702048800a21d96fd5 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,10 +13,12 @@
@@ -13,13 +13,17 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
@ -20,9 +20,14 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
#include "chrome/browser/safe_browsing/ui_manager.h"
+#endif
#include "chrome/common/secure_origin_whitelist.h"
+#if 0
#include "components/omnibox/browser/omnibox_field_trial.h"
#include "components/omnibox/common/omnibox_features.h"
@@ -42,8 +44,10 @@
+#endif
#include "components/security_state/content/content_utils.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h"
@@ -42,8 +46,10 @@
#endif // defined(OS_CHROMEOS)
#if defined(FULL_SAFE_BROWSING)
@ -33,7 +38,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
namespace {
@@ -63,7 +67,9 @@ void RecordSecurityLevel(
@@ -63,7 +69,9 @@ void RecordSecurityLevel(
} // namespace
@ -43,7 +48,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -129,6 +135,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -129,6 +137,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -51,7 +56,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
// 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.
@@ -156,6 +163,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -156,6 +165,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid.");
}
}
@ -59,7 +64,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -179,6 +187,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -179,6 +189,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -67,7 +72,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -246,6 +255,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -246,6 +257,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}