From 53a4597d56e4ca47d70a0f72901d005f0019aca3 Mon Sep 17 00:00:00 2001 From: "garykac@chromium.org" Date: Tue, 24 Aug 2010 23:05:05 +0000 Subject: Rename (Host|Client)Message to Chromoting(Host|Client)Message. Rename HostMessage and ClientMessage to Chromoting{Host|Client}Message to avoid conflicts with messages in X11. Actually, only ClientMessage needs to be changed due to conflict, but HostMessage is changed to keep the names consistent. BUG=none TEST=remoting unittests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57112 Review URL: http://codereview.chromium.org/3161034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57255 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/client/x11_input_handler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'remoting/client/x11_input_handler.cc') diff --git a/remoting/client/x11_input_handler.cc b/remoting/client/x11_input_handler.cc index 455ff61..887862c 100644 --- a/remoting/client/x11_input_handler.cc +++ b/remoting/client/x11_input_handler.cc @@ -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 ClientMessage defined in -// the protocol buffer. +// Include Xlib at the end because it clashes with Status in +// base/tracked_objects.h. #include namespace remoting { -- cgit v1.1