remoting/client/x11_input_handler.cc - Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/client/x11_input_handler.cc

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Fix merge conflicts Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: remoting/client/x11_input_handler.cc

diff --git a/remoting/client/x11_input_handler.cc b/remoting/client/x11_input_handler.cc

index 455ff61dc68c8b4638bf5251a3a2e9b5524bae5a..887862c330232b2423a618b81c2ed7aa452d5c66 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 {

« no previous file with comments | « remoting/client/plugin/pepper_view.cc ('k') | remoting/client/x11_view.h » ('j') | no next file with comments »