Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(830)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2279763003: Revert "Move WebSocketHandleImpl into Blink" (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c68e0df855e2d299d5d40c94694cd2afa095d36e..95165ffa90454bbfe6eec5fffa8ab0de4559597b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -132,6 +132,7 @@
#include "content/renderer/web_frame_utils.h"
#include "content/renderer/web_ui_extension.h"
#include "content/renderer/websharedworker_proxy.h"
+#include "content/renderer/websockethandle_impl.h"
#include "crypto/sha2.h"
#include "gin/modules/module_registry.h"
#include "media/audio/audio_output_device.h"
@@ -4306,6 +4307,15 @@ blink::WebPushClient* RenderFrameImpl::pushClient() {
return push_messaging_dispatcher_;
}
+void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) {
+ // Initialize the WebSocketHandle with our InterfaceProvider to provide the
+ // WebSocket implementation with context about this frame. This is important
+ // so that the browser can show UI associated with the WebSocket (e.g., for
+ // certificate errors).
+ static_cast<WebSocketHandleImpl*>(handle)->Initialize(
+ blink_interface_provider_.get());
+}
+
void RenderFrameImpl::willStartUsingPeerConnectionHandler(
blink::WebRTCPeerConnectionHandler* handler) {
#if defined(ENABLE_WEBRTC)
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698