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

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

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in 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
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/web_socket_factory.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 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
21 22
22 using blink::WebSecurityOrigin; 23 using blink::WebSecurityOrigin;
23 using blink::WebSocketHandle; 24 using blink::WebSocketHandle;
24 using blink::WebSocketHandleClient; 25 using blink::WebSocketHandleClient;
25 using blink::WebString; 26 using blink::WebString;
26 using blink::WebURL; 27 using blink::WebURL;
27 using blink::WebVector; 28 using blink::WebVector;
28 29
29 using mojo::ConvertTo; 30 using mojo::ConvertTo;
30 using mojo::String; 31 using mojo::String;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 const char* data) { 217 const char* data) {
217 web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes); 218 web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes);
218 } 219 }
219 220
220 void WebSocketHandleImpl::Disconnect() { 221 void WebSocketHandleImpl::Disconnect() {
221 did_close_ = true; 222 did_close_ = true;
222 client_.reset(); 223 client_.reset();
223 } 224 }
224 225
225 } // namespace html_viewer 226 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/html_frame.cc ('k') | content/browser/presentation/presentation_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698