| Index: remoting/client/x11_input_handler.cc
|
| ===================================================================
|
| --- remoting/client/x11_input_handler.cc (revision 57114)
|
| +++ remoting/client/x11_input_handler.cc (working copy)
|
| @@ -9,8 +9,8 @@
|
| #include "remoting/client/x11_view.h"
|
| #include "remoting/jingle_glue/jingle_thread.h"
|
|
|
| -// Include Xlib at the end because it clashes with Status in
|
| -// base/tracked_objects.h.
|
| +// Include Xlib at the end because it clashes with ClientMessage defined in
|
| +// the protocol buffer.
|
| #include <X11/Xlib.h>
|
|
|
| namespace remoting {
|
|
|