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

chore: bump chromium to cbeb16cf544f79c1990f1eae4d4fe (master) (#19610)

Browse source 
Co-authored-by: Erick Zhao <erickzhao@github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by Micha Hanselmann <DeerMichel@github.com>
This commit is contained in:
Electron Bot 2019-08-15 16:50:58 -04:00 • committed by Shelley Vohr
parent 12df0e8994
commit db21391156
71 changed files with 348 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

41
patches/chromium/ssl_security_state_tab_helper.patch
View file

@ -6,15 +6,16 @@ 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 f271b01fad91c169afb06795d9b8aa7207744139..9fa6773a8591686a4bf3d934080389b4af1b527f 100644
index 76036ce8f4e09e99141940bb72c0424bce556c43..7e63568010a6646df62aab2f418d659f9ec9eee3 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,15 +13,19 @@
@@ -13,16 +13,20 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
+#if 0
#include "chrome/browser/browser_process.h"
#include "chrome/browser/lookalikes/safety_tips/reputation_web_contents_observer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/ui_manager.h"
@ -29,7 +30,7 @@ index f271b01fad91c169afb06795d9b8aa7207744139..9fa6773a8591686a4bf3d934080389b4
#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 @@
@@ -44,7 +48,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -38,7 +39,19 @@ index f271b01fad91c169afb06795d9b8aa7207744139..9fa6773a8591686a4bf3d934080389b4
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -65,8 +69,9 @@ void RecordSecurityLevel(
@@ -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
} // namespace
@ -49,7 +62,23 @@ index f271b01fad91c169afb06795d9b8aa7207744139..9fa6773a8591686a4bf3d934080389b4
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -154,6 +159,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -102,6 +109,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
// information is still being initialized, thus no need to check for that.
state->malicious_content_status = GetMaliciousContentStatus();
+#if 0
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;
+#endif
return state;
}
@@ -176,6 +185,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -57,7 +86,7 @@ index f271b01fad91c169afb06795d9b8aa7207744139..9fa6773a8591686a4bf3d934080389b4
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -220,6 +226,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -242,6 +252,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}