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

Side by Side Diff: remoting/signaling/server_log_entry.cc

Issue 545003004: Roll WebRTC 7011:7046 libjingle: 7007:7045 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/signaling/server_log_entry.h" 5 #include "remoting/signaling/server_log_entry.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/sys_info.h" 8 #include "base/sys_info.h"
9 #include "remoting/base/constants.h" 9 #include "remoting/base/constants.h"
10 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" 10 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
11 11
12 using base::SysInfo; 12 using base::SysInfo;
13 using buzz::QName; 13 using buzz::QName;
14 using buzz::XmlElement; 14 using buzz::XmlElement;
15 15
16 namespace remoting { 16 namespace remoting {
17 17
18 namespace { 18 namespace {
19 19
20 const char kLogCommand[] = "log"; 20 const char kLogCommand[] = "log";
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 scoped_ptr<XmlElement> stanza(new XmlElement(QName( 79 scoped_ptr<XmlElement> stanza(new XmlElement(QName(
80 kChromotingXmlNamespace, kLogEntry))); 80 kChromotingXmlNamespace, kLogEntry)));
81 ValuesMap::const_iterator iter; 81 ValuesMap::const_iterator iter;
82 for (iter = values_map_.begin(); iter != values_map_.end(); ++iter) { 82 for (iter = values_map_.begin(); iter != values_map_.end(); ++iter) {
83 stanza->AddAttr(QName(std::string(), iter->first), iter->second); 83 stanza->AddAttr(QName(std::string(), iter->first), iter->second);
84 } 84 }
85 return stanza.Pass(); 85 return stanza.Pass();
86 } 86 }
87 87
88 } // namespace remoting 88 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/signaling/mock_signal_strategy.h ('k') | remoting/signaling/server_log_entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698