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

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

Issue 9600066: Roll libjingle to r124 and roll webrtc to 1888. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 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 (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 #include "remoting/jingle_glue/xmpp_socket_adapter.h" 5 #include "remoting/jingle_glue/xmpp_socket_adapter.h"
6 6
7 #include <iomanip> 7 #include <iomanip>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "remoting/jingle_glue/ssl_adapter.h" 11 #include "remoting/jingle_glue/ssl_adapter.h"
12 #include "third_party/libjingle/overrides/talk/base/byteorder.h"
13 #include "third_party/libjingle/overrides/talk/base/thread.h" 12 #include "third_party/libjingle/overrides/talk/base/thread.h"
13 #include "third_party/libjingle/source/talk/base/byteorder.h"
14 #include "third_party/libjingle/source/talk/base/common.h" 14 #include "third_party/libjingle/source/talk/base/common.h"
15 #include "third_party/libjingle/source/talk/base/firewallsocketserver.h" 15 #include "third_party/libjingle/source/talk/base/firewallsocketserver.h"
16 #include "third_party/libjingle/source/talk/base/socketadapters.h" 16 #include "third_party/libjingle/source/talk/base/socketadapters.h"
17 #include "third_party/libjingle/source/talk/base/ssladapter.h" 17 #include "third_party/libjingle/source/talk/base/ssladapter.h"
18 #include "third_party/libjingle/source/talk/xmpp/xmppengine.h" 18 #include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
19 19
20 namespace remoting { 20 namespace remoting {
21 21
22 XmppSocketAdapter::XmppSocketAdapter(const buzz::XmppClientSettings& xcs, 22 XmppSocketAdapter::XmppSocketAdapter(const buzz::XmppClientSettings& xcs,
23 bool allow_unverified_certs) 23 bool allow_unverified_certs)
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 int wsa_error = 0; 430 int wsa_error = 0;
431 FlushWriteQueue(&error, &wsa_error); 431 FlushWriteQueue(&error, &wsa_error);
432 if (error != ERROR_NONE) { 432 if (error != ERROR_NONE) {
433 Close(); 433 Close();
434 return false; 434 return false;
435 } 435 }
436 return true; 436 return true;
437 } 437 }
438 438
439 } // namespace remoting 439 } // namespace remoting
OLDNEW
« no previous file with comments | « jingle/notifier/communicator/xmpp_connection_generator.cc ('k') | remoting/protocol/content_description.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698