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/x11_client.cc | |
| 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/x11_client.cc')
| -rw-r--r-- | remoting/client/x11_client.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/client/x11_client.cc b/remoting/client/x11_client.cc index 8927610..7bfd3b4 100644 --- a/remoting/client/x11_client.cc +++ b/remoting/client/x11_client.cc @@ -15,7 +15,7 @@ #include "remoting/client/rectangle_update_decoder.h" #include "remoting/client/x11_view.h" #include "remoting/client/x11_input_handler.h" -#include "remoting/protocol/jingle_connection_to_host.h" +#include "remoting/protocol/connection_to_host.h" void ClientQuit(MessageLoop* loop) { loop->PostTask(FROM_HERE, new MessageLoop::QuitTask()); @@ -32,8 +32,7 @@ int main(int argc, char** argv) { MessageLoop ui_loop; remoting::ClientContext context; - remoting::protocol::JingleConnectionToHost connection( - context.jingle_thread()); + remoting::protocol::ConnectionToHost connection(context.jingle_thread()); remoting::X11View view; remoting::RectangleUpdateDecoder rectangle_decoder( context.decode_message_loop(), &view); |