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

chore: bump chromium to 93.0.4532.2 (main) (#29527)

Browse source 
* chore: bump chromium in DEPS to 93.0.4531.0

* chore: update patches

* Remove IPC::Listener from WebContentsObserver

2910240

* serial: Move serial policy from profile to local state

2914194

* chore: fix pip test

* chore: bump chromium in DEPS to 93.0.4532.2

* chore: update patches

* Follow up ColorChooser clean ups

2928026

* Distinguish between no default printer vs. query error

2932396

* chore: remove build_do_not_include_vr_directx_helpers_when_enable_vr.patch

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2021-06-04 19:03:31 -07:00 • committed by GitHub
parent 1c0e8a65c4
commit fa2db00e55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 169 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/api/electron_api_web_contents.cc
View file

@ -37,6 +37,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h" // nogncheck
#include "content/browser/renderer_host/render_widget_host_view_base.h" // nogncheck
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/context_menu_params.h"
#include "content/public/browser/download_request_utils.h"
#include "content/public/browser/favicon_status.h"
@ -433,7 +434,8 @@ std::u16string GetDefaultPrinterAsync() {
scoped_refptr<printing::PrintBackend> print_backend =
printing::PrintBackend::CreateInstance(
g_browser_process->GetApplicationLocale());
std::string printer_name = print_backend->GetDefaultPrinterName();
std::string printer_name;
print_backend->GetDefaultPrinterName(printer_name);
// Some devices won't have a default printer, so we should
// also check for existing printers and pick the first
@ -1816,15 +1818,6 @@ void WebContents::DevToolsResized() {
observer.OnDevToolsResized();
}
bool WebContents::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(WebContents, message)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}
void WebContents::SetOwnerWindow(NativeWindow* owner_window) {
SetOwnerWindow(GetWebContents(), owner_window);
}
@ -3204,7 +3197,7 @@ bool WebContents::CanOverscrollContent() {
return false;
}
content::ColorChooser* WebContents::OpenColorChooser(
std::unique_ptr<content::ColorChooser> WebContents::OpenColorChooser(
content::WebContents* web_contents,
SkColor color,
const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {