diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:35:19 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:35:19 +0000 |
| commit | 406e6e22b82ef80e8bc44f45d85efa68799bc552 (patch) | |
| tree | 97a517bd1d42a695affc6bc82517d61ff6549e2a /remoting/client/plugin | |
| parent | 35bf074d64099d89d5ac7abcc12ca6592618c379 (diff) | |
| download | chromium_src-406e6e22b82ef80e8bc44f45d85efa68799bc552.zip chromium_src-406e6e22b82ef80e8bc44f45d85efa68799bc552.tar.gz chromium_src-406e6e22b82ef80e8bc44f45d85efa68799bc552.tar.bz2 | |
Fold jingle_connection_to_host into connection_to_host.
BUG=none
TEST=unittests
Review URL: http://codereview.chromium.org/6532099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index df4224d..bb944d0 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -25,7 +25,6 @@ #include "remoting/jingle_glue/jingle_thread.h" #include "remoting/proto/auth.pb.h" #include "remoting/protocol/connection_to_host.h" -#include "remoting/protocol/jingle_connection_to_host.h" namespace remoting { @@ -70,7 +69,7 @@ bool ChromotingInstance::Init(uint32_t argc, context_.Start(); // Create the chromoting objects. - host_connection_.reset(new protocol::JingleConnectionToHost( + host_connection_.reset(new protocol::ConnectionToHost( context_.jingle_thread())); view_.reset(new PepperView(this, &context_)); view_proxy_ = new PepperViewProxy(this, view_.get()); |