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

Side by Side Diff: components/html_viewer/web_socket_handle_impl.cc

Issue 1290323002: HTMLViewer no longer connects to NetworkService interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « components/html_viewer/web_socket_handle_impl.h ('k') | mandoline/tab/frame_connection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/html_viewer/web_socket_handle_impl.h" 5 #include "components/html_viewer/web_socket_handle_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "components/html_viewer/blink_basic_type_converters.h" 12 #include "components/html_viewer/blink_basic_type_converters.h"
13 #include "mojo/services/network/public/cpp/web_socket_read_queue.h" 13 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
14 #include "mojo/services/network/public/cpp/web_socket_write_queue.h" 14 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
15 #include "mojo/services/network/public/interfaces/network_service.mojom.h" 15 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
16 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 16 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
17 #include "third_party/WebKit/public/platform/WebSocketHandleClient.h" 17 #include "third_party/WebKit/public/platform/WebSocketHandleClient.h"
18 #include "third_party/WebKit/public/platform/WebString.h" 18 #include "third_party/WebKit/public/platform/WebString.h"
19 #include "third_party/WebKit/public/platform/WebURL.h" 19 #include "third_party/WebKit/public/platform/WebURL.h"
20 #include "third_party/WebKit/public/platform/WebVector.h" 20 #include "third_party/WebKit/public/platform/WebVector.h"
21 21
22 using blink::WebSecurityOrigin; 22 using blink::WebSecurityOrigin;
23 using blink::WebSocketHandle; 23 using blink::WebSocketHandle;
24 using blink::WebSocketHandleClient; 24 using blink::WebSocketHandleClient;
25 using blink::WebString; 25 using blink::WebString;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // |handle_| owns this object, so it is guaranteed to outlive us. 140 // |handle_| owns this object, so it is guaranteed to outlive us.
141 WebSocketHandleImpl* handle_; 141 WebSocketHandleImpl* handle_;
142 blink::WebSocketHandleClient* client_; 142 blink::WebSocketHandleClient* client_;
143 mojo::ScopedDataPipeConsumerHandle receive_stream_; 143 mojo::ScopedDataPipeConsumerHandle receive_stream_;
144 scoped_ptr<WebSocketReadQueue> read_queue_; 144 scoped_ptr<WebSocketReadQueue> read_queue_;
145 mojo::Binding<mojo::WebSocketClient> binding_; 145 mojo::Binding<mojo::WebSocketClient> binding_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(WebSocketClientImpl); 147 DISALLOW_COPY_AND_ASSIGN(WebSocketClientImpl);
148 }; 148 };
149 149
150 WebSocketHandleImpl::WebSocketHandleImpl(mojo::NetworkService* network_service) 150 WebSocketHandleImpl::WebSocketHandleImpl(mojo::WebSocketFactory* factory)
151 : did_close_(false) { 151 : did_close_(false) {
152 network_service->CreateWebSocket(GetProxy(&web_socket_)); 152 factory->CreateWebSocket(GetProxy(&web_socket_));
153 } 153 }
154 154
155 WebSocketHandleImpl::~WebSocketHandleImpl() { 155 WebSocketHandleImpl::~WebSocketHandleImpl() {
156 if (!did_close_) { 156 if (!did_close_) {
157 // The connection is abruptly disconnected by the renderer without 157 // The connection is abruptly disconnected by the renderer without
158 // closing handshake. 158 // closing handshake.
159 web_socket_->Close(WebSocket::kAbnormalCloseCode, String()); 159 web_socket_->Close(WebSocket::kAbnormalCloseCode, String());
160 } 160 }
161 } 161 }
162 162
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 const char* data) { 216 const char* data) {
217 web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes); 217 web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes);
218 } 218 }
219 219
220 void WebSocketHandleImpl::Disconnect() { 220 void WebSocketHandleImpl::Disconnect() {
221 did_close_ = true; 221 did_close_ = true;
222 client_.reset(); 222 client_.reset();
223 } 223 }
224 224
225 } // namespace html_viewer 225 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/web_socket_handle_impl.h ('k') | mandoline/tab/frame_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698