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

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 edc8a890ac5da4c744e1ca10d4a1dc6cce7d625a..8125d4a08e81cefd8ef2f01fa230e033272f0a3f 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -42,7 +42,7 @@ class NET_EXPORT WebSocketChannel {
typedef base::Callback<scoped_ptr<WebSocketStreamRequest>(
const GURL&,
const std::vector<std::string>&,
- const GURL&,
+ const std::string&,
abarth-chromium 2014/02/24 06:17:06 It's too bad we've lost the type information at th
yhirano 2014/03/03 15:41:54 Done.
URLRequestContext*,
const BoundNetLog&,
scoped_ptr<WebSocketStream::ConnectDelegate>)> WebSocketStreamCreator;
@@ -58,7 +58,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequest(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin);
+ const std::string& 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 +96,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequestForTesting(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin,
+ const std::string& origin,
const WebSocketStreamCreator& creator);
// The default timout for the closing handshake is a sensible value (see
@@ -151,7 +151,7 @@ class NET_EXPORT WebSocketChannel {
void SendAddChannelRequestWithSuppliedCreator(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin,
+ const std::string& origin,
const WebSocketStreamCreator& creator);
// Success callback from WebSocketStream::CreateAndConnectStream(). Reports

Powered by Google App Engine
This is Rietveld 408576698