Enable chromoting in the build by default

remoting/client/x11_client.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file implements a X11 chromoting client.
 
 #include <iostream>
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "remoting/client/host_connection.h"
 #include "remoting/client/client_util.h"
 
 // Include Xlib at the end because it clashes with ClientMessage defined in
 // the protocol buffer.
 // x11_view.h also includes Xlib.h so put it behind all other headers but
 // before Xlib.h
 #include "remoting/client/x11_view.h"
+
+// Cursor defined in Quickdraw.h on mac conflicts with X.h.
+#if defined(OS_MAC)
+#define Cursor X11_Cursor
+#endif
 #include <X11/Xlib.h>
+#if defined(OS_MAC)
+#undef Cursor
+#endif
 
 namespace remoting {
 
 class X11Client : public base::RefCountedThreadSafe<X11Client>,
                   public HostConnection::EventHandler {
  public:
   X11Client(std::string host_jid, std::string username, std::string auth_token)
       : display_(NULL),
         window_(0),
         width_(0),
@@ skipping 222 matching lines @@
 
   if (!remoting::GetLoginInfo(host_jid, username, auth_token)) {
     std::cout << "Cannot obtain login info" << std::endl;
     return 1;
   }
 
   scoped_refptr<remoting::X11Client> client =
       new remoting::X11Client(host_jid, username, auth_token);
   client->Run();
 }