diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 08:29:47 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 08:29:47 +0000 |
| commit | 09ce892f90c852fb1e022d76a0c1d7f64c8bcef5 (patch) | |
| tree | 2149bd100e4f2acae66fa2b6c598555efabe7eff /remoting/protocol | |
| parent | 25f599029155c5550d6ce29f55bc46b766a6c92d (diff) | |
| download | chromium_src-09ce892f90c852fb1e022d76a0c1d7f64c8bcef5.zip chromium_src-09ce892f90c852fb1e022d76a0c1d7f64c8bcef5.tar.gz chromium_src-09ce892f90c852fb1e022d76a0c1d7f64c8bcef5.tar.bz2 | |
Include the headers from the libjingle overrides.
BUG=116567
TEST=apprtc.appspot.com
Review URL: http://codereview.chromium.org/9581015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -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 |
4 files changed, 7 insertions, 6 deletions
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 { |