summaryrefslogtreecommitdiffstats
path: root/remoting/client/x11_client.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 20:49:23 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 20:49:23 +0000
commit3cfca74ef66bbc17cc51dd6afdbb4763aefbd215 (patch)
treeefc9029423a3f738c0ad9210a34fa1dd8dd6003b /remoting/client/x11_client.cc
parent583335e29fb77b9a18f43c6804b8bfcd1b3f1d52 (diff)
downloadchromium_src-3cfca74ef66bbc17cc51dd6afdbb4763aefbd215.zip
chromium_src-3cfca74ef66bbc17cc51dd6afdbb4763aefbd215.tar.gz
chromium_src-3cfca74ef66bbc17cc51dd6afdbb4763aefbd215.tar.bz2
Removed dependence on remoting/client from remoting/protocol.
Reenable commented targets in remoting.gyp BUG=None TEST=compiles Review URL: http://codereview.chromium.org/4558001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/x11_client.cc')
-rw-r--r--remoting/client/x11_client.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/client/x11_client.cc b/remoting/client/x11_client.cc
index 77158d78..8927610 100644
--- a/remoting/client/x11_client.cc
+++ b/remoting/client/x11_client.cc
@@ -7,8 +7,10 @@
#include <iostream>
#include "base/at_exit.h"
+#include "base/message_loop.h"
#include "remoting/client/chromoting_client.h"
#include "remoting/client/client_config.h"
+#include "remoting/client/client_context.h"
#include "remoting/client/client_util.h"
#include "remoting/client/rectangle_update_decoder.h"
#include "remoting/client/x11_view.h"
@@ -30,7 +32,8 @@ int main(int argc, char** argv) {
MessageLoop ui_loop;
remoting::ClientContext context;
- remoting::protocol::JingleConnectionToHost connection(&context);
+ remoting::protocol::JingleConnectionToHost connection(
+ context.jingle_thread());
remoting::X11View view;
remoting::RectangleUpdateDecoder rectangle_decoder(
context.decode_message_loop(), &view);