| OLD | NEW | 
|---|
| 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/protocol/content_description.h" | 5 #include "remoting/protocol/content_description.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/base64.h" | 9 #include "base/base64.h" | 
| 10 #include "base/logging.h" | 10 #include "base/logging.h" | 
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" | 
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" | 
| 13 #include "remoting/base/constants.h" | 13 #include "remoting/base/constants.h" | 
| 14 #include "remoting/protocol/authenticator.h" | 14 #include "remoting/protocol/authenticator.h" | 
| 15 #include "remoting/protocol/name_value_map.h" | 15 #include "remoting/protocol/name_value_map.h" | 
| 16 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" | 16 #include "third_party/libjingle_xmpp/xmllite/xmlelement.h" | 
| 17 | 17 | 
| 18 using buzz::QName; | 18 using buzz::QName; | 
| 19 using buzz::XmlElement; | 19 using buzz::XmlElement; | 
| 20 | 20 | 
| 21 namespace remoting { | 21 namespace remoting { | 
| 22 namespace protocol { | 22 namespace protocol { | 
| 23 | 23 | 
| 24 const char ContentDescription::kChromotingContentName[] = "chromoting"; | 24 const char ContentDescription::kChromotingContentName[] = "chromoting"; | 
| 25 | 25 | 
| 26 namespace { | 26 namespace { | 
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 236   const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); | 236   const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); | 
| 237   if (child) | 237   if (child) | 
| 238     authenticator_message.reset(new XmlElement(*child)); | 238     authenticator_message.reset(new XmlElement(*child)); | 
| 239 | 239 | 
| 240   return base::WrapUnique(new ContentDescription( | 240   return base::WrapUnique(new ContentDescription( | 
| 241       std::move(config), std::move(authenticator_message))); | 241       std::move(config), std::move(authenticator_message))); | 
| 242 } | 242 } | 
| 243 | 243 | 
| 244 }  // namespace protocol | 244 }  // namespace protocol | 
| 245 }  // namespace remoting | 245 }  // namespace remoting | 
| OLD | NEW | 
|---|