diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 21:36:59 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 21:36:59 +0000 |
| commit | 6d2464543977cd709ae1108f958dee5d2c09667b (patch) | |
| tree | e9860999bae763a0b4ad65746246ff38097df915 /chrome/browser/sync | |
| parent | 131c7d21f8d44f015acd121d3d1e7133463905af (diff) | |
| download | chromium_src-6d2464543977cd709ae1108f958dee5d2c09667b.zip chromium_src-6d2464543977cd709ae1108f958dee5d2c09667b.tar.gz chromium_src-6d2464543977cd709ae1108f958dee5d2c09667b.tar.bz2 | |
Ripped out talk/p2p directory from third_party/libjingle.
Fixed a few compile errors as a result.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/790002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sync/notifier/communicator/connection_settings.cc b/chrome/browser/sync/notifier/communicator/connection_settings.cc index 320a396..95193fc 100644 --- a/chrome/browser/sync/notifier/communicator/connection_settings.cc +++ b/chrome/browser/sync/notifier/communicator/connection_settings.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <algorithm> #include <deque> #include <string> #include <vector> diff --git a/chrome/browser/sync/notifier/communicator/connection_settings.h b/chrome/browser/sync/notifier/communicator/connection_settings.h index 9dcfadb..ac7f357 100644 --- a/chrome/browser/sync/notifier/communicator/connection_settings.h +++ b/chrome/browser/sync/notifier/communicator/connection_settings.h @@ -9,11 +9,7 @@ #include <string> #include <vector> -#include "talk/p2p/base/port.h" - -namespace buzz { - class XmppClientSettings; -} +#include "talk/xmpp/xmppclientsettings.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc index e6ede1d..e67e5dd 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc +++ b/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc @@ -15,6 +15,7 @@ #include "talk/base/firewallsocketserver.h" #include "talk/base/logging.h" #include "talk/base/socketadapters.h" +#include "talk/base/thread.h" #include "talk/xmpp/xmppengine.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/listener/mediator_thread.h b/chrome/browser/sync/notifier/listener/mediator_thread.h index 66682929..12cef6d8 100644 --- a/chrome/browser/sync/notifier/listener/mediator_thread.h +++ b/chrome/browser/sync/notifier/listener/mediator_thread.h @@ -10,6 +10,7 @@ #include "base/logging.h" #include "chrome/browser/sync/notification_method.h" +#include "talk/base/sigslot.h" #include "talk/xmpp/xmppclientsettings.h" namespace browser_sync { diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_impl.h b/chrome/browser/sync/notifier/listener/talk_mediator_impl.h index 6b9ce20..98cc642 100644 --- a/chrome/browser/sync/notifier/listener/talk_mediator_impl.h +++ b/chrome/browser/sync/notifier/listener/talk_mediator_impl.h @@ -17,6 +17,7 @@ #include "chrome/browser/sync/notification_method.h" #include "chrome/browser/sync/notifier/listener/mediator_thread.h" #include "chrome/browser/sync/notifier/listener/talk_mediator.h" +#include "talk/base/sigslot.h" #include "talk/xmpp/xmppclientsettings.h" #include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST |