content/browser/renderer_host/websocket_host.h - Issue 304093003: Support recovery from SSL errors for new WebSocket implementation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/websocket_host.h

Issue 304093003: Support recovery from SSL errors for new WebSocket implementation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-for-pool-throttling

Patch Set: Fixes from tyoshino review. Created 6 years, 7 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/browser/renderer_host/websocket_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/websocket_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/websocket_host.h

diff --git a/content/browser/renderer_host/websocket_host.h b/content/browser/renderer_host/websocket_host.h

index 148d6ed217a0624e4682a24e524ff6a73981ce9a..21c77dcbbd558fe56d77ca147f3e60f208875779 100644

--- a/content/browser/renderer_host/websocket_host.h

+++ b/content/browser/renderer_host/websocket_host.h

@@ -50,7 +50,8 @@ class CONTENT_EXPORT WebSocketHost {

void OnAddChannelRequest(const GURL& socket_url,

const std::vector<std::string>& requested_protocols,

- const url::Origin& origin);

+ const url::Origin& origin,

+ int render_frame_id);

void OnSendFrame(bool fin,

WebSocketMessageType type,

@@ -63,8 +64,14 @@ class CONTENT_EXPORT WebSocketHost {

// The channel we use to send events to the network.

scoped_ptr<net::WebSocketChannel> channel_;

+ // The WebSocketHostDispatcher that created this object.

+ WebSocketDispatcherHost* const dispatcher_;

+ // The URL request context for the channel.

+ net::URLRequestContext* const url_request_context_;

// The ID used to route messages.

- int routing_id_;

+ const int routing_id_;

DISALLOW_COPY_AND_ASSIGN(WebSocketHost);

};