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

Unified Diff: net/websockets/websocket_channel.h

Issue 170843007: Introduce url::Origin to represent Web Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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: net/websockets/websocket_channel.h
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 40b76c9f73aa544188d62bb58ed8010ac73dc960..b0d2b78891fbdc0585300b23a22d61cf1a4fc29b 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -22,6 +22,8 @@
#include "net/websockets/websocket_stream.h"
#include "url/gurl.h"
+class SerializedOrigin;
+
namespace net {
class BoundNetLog;
@@ -42,7 +44,7 @@ class NET_EXPORT WebSocketChannel {
typedef base::Callback<scoped_ptr<WebSocketStreamRequest>(
const GURL&,
const std::vector<std::string>&,
- const GURL&,
+ const SerializedOrigin&,
URLRequestContext*,
const BoundNetLog&,
scoped_ptr<WebSocketStream::ConnectDelegate>)> WebSocketStreamCreator;
@@ -58,7 +60,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequest(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin);
+ const SerializedOrigin& origin);
// Sends a data frame to the remote side. The frame should usually be no
// larger than 32KB to prevent the time required to copy the buffers from from
@@ -96,7 +98,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequestForTesting(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin,
+ const SerializedOrigin& origin,
const WebSocketStreamCreator& creator);
// The default timout for the closing handshake is a sensible value (see
@@ -151,7 +153,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequestWithSuppliedCreator(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin,
+ const SerializedOrigin& origin,
const WebSocketStreamCreator& creator);
// Success callback from WebSocketStream::CreateAndConnectStream(). Reports

Powered by Google App Engine
This is Rietveld 408576698