Enable chromoting in the build by default

remoting/client/x11_view.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.
 
 #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>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
+#if defined(OS_MAC)
+#undef Cursor
+#endif
+
 #include "remoting/client/decoder_verbatim.h"
 
 namespace remoting {
 
-X11View::X11View(Display* display, int window, int width, int height)
+X11View::X11View(Display* display, XID window, int width, int height)
     : display_(display),
       window_(window),
       picture_(0),
       width_(width),
       height_(height) {
 }
 
 X11View::~X11View() {
 }
 
@@ skipping 27 matching lines @@
       frame_->data(media::VideoFrame::kRGBPlane));
 
   // Creates a pixmap and uploads from the XImage.
   unsigned long pixmap = XCreatePixmap(display_, window_, width_, height_, 32);
 
   GC gc = XCreateGC(display_, pixmap, 0, NULL);
   XPutImage(display_, pixmap, gc, &image, 0, 0, 0, 0, width_, height_);
   XFreeGC(display_, gc);
 
   // Creates the picture representing the pixmap.
-  unsigned long picture = XRenderCreatePicture(
+  XID picture = XRenderCreatePicture(
       display_, pixmap,
       XRenderFindStandardFormat(display_, PictStandardARGB32),
       0, NULL);
 
   // Composite the picture over the picture representing the window.
   XRenderComposite(display_, PictOpSrc, picture, 0,
                    picture_, 0, 0, 0, 0, 0, 0,
                    width_, height_);
 
   XRenderFreePicture(display_, picture);
@@ skipping 68 matching lines @@
   XEvent event;
   event.type = Expose;
   XSendEvent(display_, static_cast<int>(window_), true, ExposureMask, &event);
 }
 
 void X11View::OnDecodeDone() {
   // Since we do synchronous decoding here there's nothing in this method.
 }
 
 }  // namespace remoting