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

Side by Side Diff: jingle/glue/utils.cc

Issue 9616021: Include the headers from the libjingle overrides. (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
« no previous file with comments | « no previous file | no next file » | 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) 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 #include "jingle/glue/utils.h" 5 #include "jingle/glue/utils.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "net/base/ip_endpoint.h" 12 #include "net/base/ip_endpoint.h"
13 #include "net/base/net_util.h" 13 #include "net/base/net_util.h"
14 #include "third_party/libjingle/source/talk/base/byteorder.h" 14 #include "third_party/libjingle/overrides/talk/base/byteorder.h"
15 #include "third_party/libjingle/source/talk/base/socketaddress.h" 15 #include "third_party/libjingle/source/talk/base/socketaddress.h"
16 #include "third_party/libjingle/source/talk/p2p/base/candidate.h" 16 #include "third_party/libjingle/source/talk/p2p/base/candidate.h"
17 17
18 namespace jingle_glue { 18 namespace jingle_glue {
19 19
20 bool IPEndPointToSocketAddress(const net::IPEndPoint& address_chrome, 20 bool IPEndPointToSocketAddress(const net::IPEndPoint& address_chrome,
21 talk_base::SocketAddress* address_lj) { 21 talk_base::SocketAddress* address_lj) {
22 if (address_chrome.GetFamily() != AF_INET) { 22 if (address_chrome.GetFamily() != AF_INET) {
23 LOG(ERROR) << "Only IPv4 addresses are supported."; 23 LOG(ERROR) << "Only IPv4 addresses are supported.";
24 return false; 24 return false;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 candidate->set_protocol(protocol); 94 candidate->set_protocol(protocol);
95 candidate->set_username(username); 95 candidate->set_username(username);
96 candidate->set_password(password); 96 candidate->set_password(password);
97 candidate->set_preference(static_cast<float>(preference)); 97 candidate->set_preference(static_cast<float>(preference));
98 candidate->set_generation(generation); 98 candidate->set_generation(generation);
99 99
100 return true; 100 return true;
101 } 101 }
102 102
103 } // namespace jingle_glue 103 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698