diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
| commit | 319dab11b1ee7e16b8f4089261f47d353aa8a466 (patch) | |
| tree | 6c8db94b10f88a7e8711cd3b06ed8ab6fda39070 /remoting/protocol/jingle_chromoting_server.cc | |
| parent | 4993f34cdf20cf9e1124656164e2c647efba6989 (diff) | |
| download | chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.zip chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.gz chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.bz2 | |
Added control channel in ChromotingConnection. Moved channel
initialization to OnInitiate() in JingleChromotingConnection.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/4055002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_chromoting_server.cc')
| -rw-r--r-- | remoting/protocol/jingle_chromoting_server.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/protocol/jingle_chromoting_server.cc b/remoting/protocol/jingle_chromoting_server.cc index 09ed2b7..802689d 100644 --- a/remoting/protocol/jingle_chromoting_server.cc +++ b/remoting/protocol/jingle_chromoting_server.cc @@ -462,7 +462,8 @@ bool JingleChromotingServer::WriteContent( SessionDescription* JingleChromotingServer::CreateSessionDescription( const CandidateChromotocolConfig* config) { SessionDescription* desc = new SessionDescription(); - desc->AddContent(kChromotingContentName, kChromotingXmlNamespace, + desc->AddContent(JingleChromotingConnection::kChromotingContentName, + kChromotingXmlNamespace, new ChromotingContentDescription(config)); return desc; } |