| Index: jingle/notifier/base/proxy_resolving_client_socket.h
|
| diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h
|
| index c89d77b6a4e60154c4e95ede1c2adb11aa875149..f94ac4cfaa847d5cc38251352241190bd876d21e 100644
|
| --- a/jingle/notifier/base/proxy_resolving_client_socket.h
|
| +++ b/jingle/notifier/base/proxy_resolving_client_socket.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| //
|
| @@ -65,6 +65,7 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
| virtual bool UsingTCPFastOpen() const OVERRIDE;
|
| virtual int64 NumBytesRead() const OVERRIDE;
|
| virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
|
| + virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
|
|
|
| private:
|
| // Proxy resolution and connection functions.
|
|
|