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

Side by Side Diff: net/socket/ssl_client_socket.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
« no previous file with comments | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_nss.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SOCKET_SSL_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 enum NextProtoStatus { 73 enum NextProtoStatus {
74 // WARNING: These values are serialized to disk. Don't change them. 74 // WARNING: These values are serialized to disk. Don't change them.
75 75
76 kNextProtoUnsupported = 0, // The server doesn't support NPN. 76 kNextProtoUnsupported = 0, // The server doesn't support NPN.
77 kNextProtoNegotiated = 1, // We agreed on a protocol. 77 kNextProtoNegotiated = 1, // We agreed on a protocol.
78 kNextProtoNoOverlap = 2, // No protocols in common. We requested 78 kNextProtoNoOverlap = 2, // No protocols in common. We requested
79 // the first protocol in our list. 79 // the first protocol in our list.
80 }; 80 };
81 81
82 // StreamSocket: 82 // StreamSocket:
83 virtual bool WasNpnNegotiated() const OVERRIDE; 83 virtual bool WasNpnNegotiated() const override;
84 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 84 virtual NextProto GetNegotiatedProtocol() const override;
85 85
86 // Computes a unique key string for the SSL session cache. 86 // Computes a unique key string for the SSL session cache.
87 virtual std::string GetSessionCacheKey() const = 0; 87 virtual std::string GetSessionCacheKey() const = 0;
88 88
89 // Returns true if there is a cache entry in the SSL session cache 89 // Returns true if there is a cache entry in the SSL session cache
90 // for the cache key of the SSL socket. 90 // for the cache key of the SSL socket.
91 // 91 //
92 // The cache key consists of a host and port concatenated with a session 92 // The cache key consists of a host and port concatenated with a session
93 // cache shard. These two strings are passed to the constructor of most 93 // cache shard. These two strings are passed to the constructor of most
94 // subclasses of SSLClientSocket. 94 // subclasses of SSLClientSocket.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 bool channel_id_sent_; 217 bool channel_id_sent_;
218 // True if SCTs were received via a TLS extension. 218 // True if SCTs were received via a TLS extension.
219 bool signed_cert_timestamps_received_; 219 bool signed_cert_timestamps_received_;
220 // True if a stapled OCSP response was received. 220 // True if a stapled OCSP response was received.
221 bool stapled_ocsp_response_received_; 221 bool stapled_ocsp_response_received_;
222 }; 222 };
223 223
224 } // namespace net 224 } // namespace net
225 225
226 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 226 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW
« no previous file with comments | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698