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

Unified Diff: content/browser/renderer_host/socket_stream_dispatcher_host.cc

Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reflects review comments Created 8 years, 9 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
Index: content/browser/renderer_host/socket_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index 57894def651ef475257bc338c720e6b91654af02..5a1fa6e7d21b7e7fa31c642717a12ae98bdb7d0f 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -134,15 +134,19 @@ bool SocketStreamDispatcherHost::CanSetCookie(net::SocketStream* request,
}
// Message handlers called by OnMessageReceived.
-void SocketStreamDispatcherHost::OnConnect(const GURL& url, int socket_id) {
- DVLOG(1) << "SocketStreamDispatcherHost::OnConnect url=" << url
+void SocketStreamDispatcherHost::OnConnect(int routing_id,
+ const GURL& url,
+ int socket_id) {
+ DVLOG(1) << "SocketStreamDispatcherHost::OnConnect routing_id=" << routing_id
+ << " url=" << url
<< " socket_id=" << socket_id;
DCHECK_NE(content_common::kNoSocketId, socket_id);
if (hosts_.Lookup(socket_id)) {
LOG(ERROR) << "socket_id=" << socket_id << " already registered.";
return;
}
- SocketStreamHost* socket_stream_host = new SocketStreamHost(this, socket_id);
+ SocketStreamHost* socket_stream_host =
+ new SocketStreamHost(this, routing_id, socket_id);
hosts_.AddWithID(socket_stream_host, socket_id);
socket_stream_host->Connect(url, GetURLRequestContext());
DVLOG(1) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;

Powered by Google App Engine
This is Rietveld 408576698