diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 22:00:20 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 22:00:20 +0000 |
| commit | 81824d23b48295a2f07ac6417a15f815e4f038a2 (patch) | |
| tree | e56de95590ab9828fff5d5ea9c79281c8d262134 /remoting/client/x11_input_handler.cc | |
| parent | e012492b4d13f638f0bfdd9524367078e34001ec (diff) | |
| download | chromium_src-81824d23b48295a2f07ac6417a15f815e4f038a2.zip chromium_src-81824d23b48295a2f07ac6417a15f815e4f038a2.tar.gz chromium_src-81824d23b48295a2f07ac6417a15f815e4f038a2.tar.bz2 | |
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
Review URL: http://codereview.chromium.org/3161034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/x11_input_handler.cc')
| -rw-r--r-- | remoting/client/x11_input_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 <X11/Xlib.h> namespace remoting { |