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

Side by Side Diff: remoting/jingle_glue/xmpp_socket_adapter.h

Issue 10209008: Roll libjingle 132:133 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_ 5 #ifndef REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_
6 #define REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_ 6 #define REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h"
10 #include "third_party/libjingle/source/talk/base/asyncsocket.h" 12 #include "third_party/libjingle/source/talk/base/asyncsocket.h"
11 #include "third_party/libjingle/source/talk/xmpp/asyncsocket.h" 13 #include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
12 #include "third_party/libjingle/source/talk/xmpp/xmppclientsettings.h" 14 #include "third_party/libjingle/source/talk/xmpp/xmppclientsettings.h"
13 #include "third_party/libjingle/source/talk/xmpp/xmppengine.h" 15 #include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
14 16
15 #ifndef _WIN32 17 #ifndef _WIN32
16 // Additional errors used by us from Win32 headers. 18 // Additional errors used by us from Win32 headers.
17 #define SEC_E_CERT_EXPIRED static_cast<int>(0x80090328L) 19 #define SEC_E_CERT_EXPIRED static_cast<int>(0x80090328L)
18 #define WSA_NOT_ENOUGH_MEMORY ENOMEM 20 #define WSA_NOT_ENOUGH_MEMORY ENOMEM
19 #endif 21 #endif
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 void FlushWriteQueue(Error* error, int* wsa_error); 80 void FlushWriteQueue(Error* error, int* wsa_error);
79 81
80 void SetError(Error error); 82 void SetError(Error error);
81 void SetWSAError(int error); 83 void SetWSAError(int error);
82 DISALLOW_COPY_AND_ASSIGN(XmppSocketAdapter); 84 DISALLOW_COPY_AND_ASSIGN(XmppSocketAdapter);
83 }; 85 };
84 86
85 } // namespace remoting 87 } // namespace remoting
86 88
87 #endif // REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_ 89 #endif // REMOTING_JINGLE_GLUE_XMPP_SOCKET_ADAPTER_H_
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_packet_socket_factory.h ('k') | remoting/protocol/jingle_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698