summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue/jingle_client.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 03:23:13 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 03:23:13 +0000
commit501b9ba1516c6fe4aa4100104c70e2f302e0b44a (patch)
tree4b124bcc6fed8536035c4ee2b30f0fbe31248b2b /remoting/jingle_glue/jingle_client.h
parent5f6f06b400de36fd3c302d4fc72045d4f960fde8 (diff)
downloadchromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.zip
chromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.tar.gz
chromium_src-501b9ba1516c6fe4aa4100104c70e2f302e0b44a.tar.bz2
Roll new libjingle. Use the new incoming_only flag in chromoting host.
BUG=81597 TEST=Unittests. Review URL: http://codereview.chromium.org/6949010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue/jingle_client.h')
-rw-r--r--remoting/jingle_glue/jingle_client.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h
index a1d6806..cb7e2d3 100644
--- a/remoting/jingle_glue/jingle_client.h
+++ b/remoting/jingle_glue/jingle_client.h
@@ -137,14 +137,10 @@ class JingleClient : public base::RefCountedThreadSafe<JingleClient>,
};
// Physical sockets are used if |network_manager| and
- // |socket_factory| are not specified. Otherwise ownership of these
+ // |socket_factory| are set to NULL. Otherwise ownership of these
// objects is given to JingleClient.
JingleClient(JingleThread* thread,
SignalStrategy* signal_strategy,
- PortAllocatorSessionFactory* session_factory,
- Callback* callback);
- JingleClient(JingleThread* thread,
- SignalStrategy* signal_strategy,
talk_base::NetworkManager* network_manager,
talk_base::PacketSocketFactory* socket_factory,
PortAllocatorSessionFactory* session_factory,