Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: remoting/host/local_input_monitor_thread_linux.cc

Issue 11366229: Move eintr_wrapper.h from base to base/posix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/linux/audio_pipe_reader.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/local_input_monitor_thread_linux.h" 5 #include "remoting/host/local_input_monitor_thread_linux.h"
6 6
7 #include <sys/select.h> 7 #include <sys/select.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 #define XK_MISCELLANY 9 #define XK_MISCELLANY
10 #include <X11/keysymdef.h> 10 #include <X11/keysymdef.h>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/eintr_wrapper.h"
15 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/posix/eintr_wrapper.h"
16 #include "remoting/host/mouse_move_observer.h" 16 #include "remoting/host/mouse_move_observer.h"
17 #include "third_party/skia/include/core/SkPoint.h" 17 #include "third_party/skia/include/core/SkPoint.h"
18 18
19 // These includes need to be later than dictated by the style guide due to 19 // These includes need to be later than dictated by the style guide due to
20 // Xlib header pollution, specifically the min, max, and Status macros. 20 // Xlib header pollution, specifically the min, max, and Status macros.
21 #include <X11/XKBlib.h> 21 #include <X11/XKBlib.h>
22 #include <X11/Xlibint.h> 22 #include <X11/Xlibint.h>
23 #include <X11/extensions/record.h> 23 #include <X11/extensions/record.h>
24 24
25 namespace { 25 namespace {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 if (key_sym == XK_Control_L || key_sym == XK_Control_R) { 181 if (key_sym == XK_Control_L || key_sym == XK_Control_R) {
182 ctrl_pressed_ = down; 182 ctrl_pressed_ = down;
183 } else if (key_sym == XK_Alt_L || key_sym == XK_Alt_R) { 183 } else if (key_sym == XK_Alt_L || key_sym == XK_Alt_R) {
184 alt_pressed_ = down; 184 alt_pressed_ = down;
185 } else if (alt_pressed_ && ctrl_pressed_ && key_sym == XK_Escape && down) { 185 } else if (alt_pressed_ && ctrl_pressed_ && key_sym == XK_Escape && down) {
186 disconnect_callback_.Run(); 186 disconnect_callback_.Run();
187 } 187 }
188 } 188 }
189 189
190 } // namespace remoting 190 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/linux/audio_pipe_reader.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698