github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499)

Browse Source 
* chore: bump chromium in DEPS to c04c17506a1b5941370b91dfa44eda7ec31e9793

* update patches

* chore: bump chromium in DEPS to 8a4687263763f306659d04cef8f0a12a9e504d57

* chore: bump chromium in DEPS to 3a75ada69d1ac06d6903a2c981ab90a8162f1ba0

* update patches

* chore: sync StartRemoteDebuggingPipeHandler usage

CL: https://chromium-review.googlesource.com/c/chromium/src/+/2536354

Added 'on_disconnect' OnceClosure arg to StartRemoteDebuggingPipeHandler

* chore: add WebSocketHandshakeClient::OnFailurea

CL: https://chromium-review.googlesource.com/c/chromium/src/+/2527889

Add an empty stub to satisfy parent class' pure virtual method OnFailure().
NB: Use of empty impl comes from WebRequestProxyingWebSocket.

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Electron Bot
2020-11-16 17:57:42 -08:00
committed by GitHub
parent a9924e1c32
commit cad2d8b4aa
27 changed files with 119 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/browser/electron_browser_main_parts.cc
View File

@@ -451,7 +451,8 @@ void ElectronBrowserMainParts::PreMainMessageLoopRun() {
auto* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kRemoteDebuggingPipe)) {
// --remote-debugging-pipe
content::DevToolsAgentHost::StartRemoteDebuggingPipeHandler();
content::DevToolsAgentHost::StartRemoteDebuggingPipeHandler(
base::OnceClosure());
} else if (command_line->HasSwitch(switches::kRemoteDebuggingPort)) {
// --remote-debugging-port
DevToolsManagerDelegate::StartHttpHandler();

4
shell/browser/net/proxying_websocket.cc
View File

@@ -117,6 +117,10 @@ void ProxyingWebSocket::ContinueToHeadersReceived() {
OnHeadersReceivedComplete(net::OK);
}
void ProxyingWebSocket::OnFailure(const std::string& message,
int32_t net_error,
int32_t response_code) {}
void ProxyingWebSocket::OnConnectionEstablished(
mojo::PendingRemote<network::mojom::WebSocket> websocket,
mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,

3
shell/browser/net/proxying_websocket.h
View File

@@ -70,6 +70,9 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
// network::mojom::WebSocketHandshakeClient methods:
void OnOpeningHandshakeStarted(
network::mojom::WebSocketHandshakeRequestPtr request) override;
void OnFailure(const std::string& message,
int32_t net_error,
int32_t response_code) override;
void OnConnectionEstablished(
mojo::PendingRemote<network::mojom::WebSocket> websocket,
mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,