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

Side by Side Diff: net/websockets/websocket_basic_stream.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_ 5 #ifndef NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_
6 #define NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_ 6 #define NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 26 matching lines...) Expand all
37 const scoped_refptr<GrowableIOBuffer>& http_read_buffer, 37 const scoped_refptr<GrowableIOBuffer>& http_read_buffer,
38 const std::string& sub_protocol, 38 const std::string& sub_protocol,
39 const std::string& extensions); 39 const std::string& extensions);
40 40
41 // The destructor has to make sure the connection is closed when we finish so 41 // The destructor has to make sure the connection is closed when we finish so
42 // that it does not get returned to the pool. 42 // that it does not get returned to the pool.
43 virtual ~WebSocketBasicStream(); 43 virtual ~WebSocketBasicStream();
44 44
45 // WebSocketStream implementation. 45 // WebSocketStream implementation.
46 virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, 46 virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames,
47 const CompletionCallback& callback) OVERRIDE; 47 const CompletionCallback& callback) override;
48 48
49 virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, 49 virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames,
50 const CompletionCallback& callback) OVERRIDE; 50 const CompletionCallback& callback) override;
51 51
52 virtual void Close() OVERRIDE; 52 virtual void Close() override;
53 53
54 virtual std::string GetSubProtocol() const OVERRIDE; 54 virtual std::string GetSubProtocol() const override;
55 55
56 virtual std::string GetExtensions() const OVERRIDE; 56 virtual std::string GetExtensions() const override;
57 57
58 //////////////////////////////////////////////////////////////////////////// 58 ////////////////////////////////////////////////////////////////////////////
59 // Methods for testing only. 59 // Methods for testing only.
60 60
61 static scoped_ptr<WebSocketBasicStream> CreateWebSocketBasicStreamForTesting( 61 static scoped_ptr<WebSocketBasicStream> CreateWebSocketBasicStreamForTesting(
62 scoped_ptr<ClientSocketHandle> connection, 62 scoped_ptr<ClientSocketHandle> connection,
63 const scoped_refptr<GrowableIOBuffer>& http_read_buffer, 63 const scoped_refptr<GrowableIOBuffer>& http_read_buffer,
64 const std::string& sub_protocol, 64 const std::string& sub_protocol,
65 const std::string& extensions, 65 const std::string& extensions,
66 WebSocketMaskingKeyGeneratorFunction key_generator_function); 66 WebSocketMaskingKeyGeneratorFunction key_generator_function);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 // This can be overridden in tests to make the output deterministic. We don't 157 // This can be overridden in tests to make the output deterministic. We don't
158 // use a Callback here because a function pointer is faster and good enough 158 // use a Callback here because a function pointer is faster and good enough
159 // for our purposes. 159 // for our purposes.
160 WebSocketMaskingKeyGeneratorFunction generate_websocket_masking_key_; 160 WebSocketMaskingKeyGeneratorFunction generate_websocket_masking_key_;
161 }; 161 };
162 162
163 } // namespace net 163 } // namespace net
164 164
165 #endif // NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_ 165 #endif // NET_WEBSOCKETS_WEBSOCKET_BASIC_STREAM_H_
OLDNEW
« no previous file with comments | « net/websockets/websocket_basic_handshake_stream.h ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698