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

Side by Side Diff: trunk/src/remoting/host/local_input_monitor_linux.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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:
View unified diff | Download patch | Annotate | Revision Log
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.h" 5 #include "remoting/host/local_input_monitor.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/bind.h" 13 #include "base/bind.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop.h"
19 #include "base/message_loop/message_pump_libevent.h" 19 #include "base/message_pump_libevent.h"
20 #include "base/posix/eintr_wrapper.h" 20 #include "base/posix/eintr_wrapper.h"
21 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
22 #include "base/threading/non_thread_safe.h" 22 #include "base/threading/non_thread_safe.h"
23 #include "remoting/host/client_session_control.h" 23 #include "remoting/host/client_session_control.h"
24 #include "third_party/skia/include/core/SkPoint.h" 24 #include "third_party/skia/include/core/SkPoint.h"
25 25
26 // These includes need to be later than dictated by the style guide due to 26 // These includes need to be later than dictated by the style guide due to
27 // Xlib header pollution, specifically the min, max, and Status macros. 27 // Xlib header pollution, specifically the min, max, and Status macros.
28 #include <X11/XKBlib.h> 28 #include <X11/XKBlib.h>
29 #include <X11/Xlibint.h> 29 #include <X11/Xlibint.h>
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 323 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
324 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 324 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
325 base::WeakPtr<ClientSessionControl> client_session_control) { 325 base::WeakPtr<ClientSessionControl> client_session_control) {
326 return scoped_ptr<LocalInputMonitor>( 326 return scoped_ptr<LocalInputMonitor>(
327 new LocalInputMonitorLinux(caller_task_runner, 327 new LocalInputMonitorLinux(caller_task_runner,
328 input_task_runner, 328 input_task_runner,
329 client_session_control)); 329 client_session_control));
330 } 330 }
331 331
332 } // namespace remoting 332 } // namespace remoting
OLDNEW
« no previous file with comments | « trunk/src/net/proxy/proxy_config_service_linux.h ('k') | trunk/src/remoting/host/posix/signal_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698