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

chore: bump chromium to 117.0.5897.0 (main) (#39147)

Browse source 
* chore: bump chromium in DEPS to 117.0.5896.0

* chore: update patches

* 4622260: [Service Workers] Allow fetches from workers to use auto-picked certs

4622260

* chore: bump chromium in DEPS to 117.0.5897.0

* 4665672: [ProfileSelections] Transition extension keyed factories to use Profile Selections

4665672

* chore: fixup patch indices

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-07-20 09:36:59 +02:00 • committed by GitHub
parent 3e7c904f02
commit e02cf8674d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 139 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/browser/electron_browser_client.cc
View file

@ -60,6 +60,7 @@
#include "extensions/browser/api/messaging/messaging_api_message_filter.h"
#include "mojo/public/cpp/bindings/binder_map.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_private_key.h"
#include "ppapi/buildflags/buildflags.h"
#include "ppapi/host/ppapi_host.h"
#include "printing/buildflags/buildflags.h"
@ -617,15 +618,19 @@ void ElectronBrowserClient::AllowCertificateError(
}
base::OnceClosure ElectronBrowserClient::SelectClientCertificate(
content::BrowserContext* browser_context,
content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info,
net::ClientCertIdentityList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) {
if (!client_certs.empty() && delegate_) {
delegate_->SelectClientCertificate(web_contents, cert_request_info,
std::move(client_certs),
std::move(delegate));
if (client_certs.empty()) {
delegate->ContinueWithCertificate(nullptr, nullptr);
} else if (delegate_) {
delegate_->SelectClientCertificate(
browser_context, web_contents, cert_request_info,
std::move(client_certs), std::move(delegate));
}
return base::OnceClosure();
}