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

Side by Side Diff: net/spdy/spdy_session_pool.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/spdy/spdy_session.h ('k') | net/spdy/spdy_session_pool_unittest.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 (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_SPDY_SPDY_SESSION_POOL_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_POOL_H_
6 #define NET_SPDY_SPDY_SESSION_POOL_H_ 6 #define NET_SPDY_SPDY_SESSION_POOL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 base::WeakPtr<HttpServerProperties> http_server_properties() { 127 base::WeakPtr<HttpServerProperties> http_server_properties() {
128 return http_server_properties_; 128 return http_server_properties_;
129 } 129 }
130 130
131 // NetworkChangeNotifier::IPAddressObserver methods: 131 // NetworkChangeNotifier::IPAddressObserver methods:
132 132
133 // We flush all idle sessions and release references to the active ones so 133 // We flush all idle sessions and release references to the active ones so
134 // they won't get re-used. The active ones will either complete successfully 134 // they won't get re-used. The active ones will either complete successfully
135 // or error out due to the IP address change. 135 // or error out due to the IP address change.
136 virtual void OnIPAddressChanged() OVERRIDE; 136 virtual void OnIPAddressChanged() override;
137 137
138 // SSLConfigService::Observer methods: 138 // SSLConfigService::Observer methods:
139 139
140 // We perform the same flushing as described above when SSL settings change. 140 // We perform the same flushing as described above when SSL settings change.
141 virtual void OnSSLConfigChanged() OVERRIDE; 141 virtual void OnSSLConfigChanged() override;
142 142
143 // CertDatabase::Observer methods: 143 // CertDatabase::Observer methods:
144 144
145 // We perform the same flushing as described above when certificate database 145 // We perform the same flushing as described above when certificate database
146 // is changed. 146 // is changed.
147 virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; 147 virtual void OnCertAdded(const X509Certificate* cert) override;
148 virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; 148 virtual void OnCACertChanged(const X509Certificate* cert) override;
149 149
150 private: 150 private:
151 friend class SpdySessionPoolPeer; // For testing. 151 friend class SpdySessionPoolPeer; // For testing.
152 152
153 typedef std::set<SpdySession*> SessionSet; 153 typedef std::set<SpdySession*> SessionSet;
154 typedef std::vector<base::WeakPtr<SpdySession> > WeakSessionList; 154 typedef std::vector<base::WeakPtr<SpdySession> > WeakSessionList;
155 typedef std::map<SpdySessionKey, base::WeakPtr<SpdySession> > 155 typedef std::map<SpdySessionKey, base::WeakPtr<SpdySession> >
156 AvailableSessionMap; 156 AvailableSessionMap;
157 typedef std::map<IPEndPoint, SpdySessionKey> AliasMap; 157 typedef std::map<IPEndPoint, SpdySessionKey> AliasMap;
158 158
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 // This SPDY proxy is allowed to push resources from origins that are 228 // This SPDY proxy is allowed to push resources from origins that are
229 // different from those of their associated streams. 229 // different from those of their associated streams.
230 HostPortPair trusted_spdy_proxy_; 230 HostPortPair trusted_spdy_proxy_;
231 231
232 DISALLOW_COPY_AND_ASSIGN(SpdySessionPool); 232 DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
233 }; 233 };
234 234
235 } // namespace net 235 } // namespace net
236 236
237 #endif // NET_SPDY_SPDY_SESSION_POOL_H_ 237 #endif // NET_SPDY_SPDY_SESSION_POOL_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_session.h ('k') | net/spdy/spdy_session_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698