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

Unified Diff: components/html_viewer/web_socket_handle_impl.cc

Issue 1229783005: Remove 'blink::WebSerializedOrigin' (4/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 5 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 | « components/html_viewer/web_socket_handle_impl.h ('k') | content/child/notifications/notification_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/web_socket_handle_impl.cc
diff --git a/components/html_viewer/web_socket_handle_impl.cc b/components/html_viewer/web_socket_handle_impl.cc
index b5ea28a1380190f0ed6b36a846325e873f31bfbf..b062c77460d4a23af6c0c6d90bce3522b83dac77 100644
--- a/components/html_viewer/web_socket_handle_impl.cc
+++ b/components/html_viewer/web_socket_handle_impl.cc
@@ -13,13 +13,13 @@
#include "mojo/services/network/public/cpp/web_socket_read_queue.h"
#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "third_party/WebKit/public/platform/WebSerializedOrigin.h"
+#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebSocketHandleClient.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-using blink::WebSerializedOrigin;
+using blink::WebSecurityOrigin;
using blink::WebSocketHandle;
using blink::WebSocketHandleClient;
using blink::WebString;
@@ -162,7 +162,7 @@ WebSocketHandleImpl::~WebSocketHandleImpl() {
void WebSocketHandleImpl::connect(const WebURL& url,
const WebVector<WebString>& protocols,
- const WebSerializedOrigin& origin,
+ const WebSecurityOrigin& origin,
WebSocketHandleClient* client) {
// TODO(mpcomplete): Is this the right ownership model? Or should mojo own
// |client_|?
@@ -179,8 +179,8 @@ void WebSocketHandleImpl::connect(const WebURL& url,
write_queue_.reset(new mojo::WebSocketWriteQueue(send_stream_.get()));
web_socket_->Connect(url.string().utf8(),
mojo::Array<String>::From(protocols),
- origin.string().utf8(), data_pipe.consumer_handle.Pass(),
- client_ptr.Pass());
+ origin.toString().utf8(),
+ data_pipe.consumer_handle.Pass(), client_ptr.Pass());
}
void WebSocketHandleImpl::send(bool fin,
« no previous file with comments | « components/html_viewer/web_socket_handle_impl.h ('k') | content/child/notifications/notification_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698