diff options
| -rw-r--r-- | remoting/jingle_glue/xmpp_socket_adapter.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/DEPS | 1 | ||||
| -rw-r--r-- | remoting/protocol/message_decoder.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/rtp_utils.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/util.cc | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/remoting/jingle_glue/xmpp_socket_adapter.cc b/remoting/jingle_glue/xmpp_socket_adapter.cc index de66c5f..e819736 100644 --- a/remoting/jingle_glue/xmpp_socket_adapter.cc +++ b/remoting/jingle_glue/xmpp_socket_adapter.cc @@ -9,12 +9,12 @@ #include "base/logging.h" #include "remoting/jingle_glue/ssl_adapter.h" -#include "third_party/libjingle/source/talk/base/byteorder.h" +#include "third_party/libjingle/overrides/talk/base/byteorder.h" +#include "third_party/libjingle/overrides/talk/base/thread.h" #include "third_party/libjingle/source/talk/base/common.h" #include "third_party/libjingle/source/talk/base/firewallsocketserver.h" #include "third_party/libjingle/source/talk/base/socketadapters.h" #include "third_party/libjingle/source/talk/base/ssladapter.h" -#include "third_party/libjingle/source/talk/base/thread.h" #include "third_party/libjingle/source/talk/xmpp/xmppengine.h" namespace remoting { diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS index c982f42..09d966f 100644 --- a/remoting/protocol/DEPS +++ b/remoting/protocol/DEPS @@ -6,5 +6,6 @@ include_rules = [ "+ppapi/cpp", "+ppapi/utility", "+remoting/jingle_glue", + "+third_party/libjingle", "+third_party/protobuf/src", ] diff --git a/remoting/protocol/message_decoder.cc b/remoting/protocol/message_decoder.cc index 2e33229..ba9c5c1 100644 --- a/remoting/protocol/message_decoder.cc +++ b/remoting/protocol/message_decoder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "net/base/io_buffer.h" #include "remoting/base/compound_buffer.h" #include "remoting/proto/internal.pb.h" -#include "third_party/libjingle/source/talk/base/byteorder.h" +#include "third_party/libjingle/overrides/talk/base/byteorder.h" namespace remoting { namespace protocol { diff --git a/remoting/protocol/rtp_utils.cc b/remoting/protocol/rtp_utils.cc index 9a56964..8643827 100644 --- a/remoting/protocol/rtp_utils.cc +++ b/remoting/protocol/rtp_utils.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "remoting/protocol/rtp_utils.h" #include "base/logging.h" -#include "third_party/libjingle/source/talk/base/byteorder.h" +#include "third_party/libjingle/overrides/talk/base/byteorder.h" using talk_base::GetBE16; using talk_base::GetBE32; diff --git a/remoting/protocol/util.cc b/remoting/protocol/util.cc index 95211c5..95ec04f 100644 --- a/remoting/protocol/util.cc +++ b/remoting/protocol/util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/hash_tables.h" #include "base/logging.h" #include "net/base/io_buffer.h" -#include "third_party/libjingle/source/talk/base/byteorder.h" +#include "third_party/libjingle/overrides/talk/base/byteorder.h" namespace { |