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

Side by Side Diff: media/base/user_input_monitor_linux.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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
« no previous file with comments | « media/base/user_input_monitor.h ('k') | media/base/user_input_monitor_mac.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/base/user_input_monitor.h" 5 #include "media/base/user_input_monitor.h"
6 6
7 #include <stddef.h>
7 #include <sys/select.h> 8 #include <sys/select.h>
8 #include <unistd.h> 9 #include <unistd.h>
9 #define XK_MISCELLANY 10 #define XK_MISCELLANY
10 #include <X11/keysymdef.h> 11 #include <X11/keysymdef.h>
11 12
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/location.h" 16 #include "base/location.h"
16 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h"
17 #include "base/message_loop/message_loop.h" 19 #include "base/message_loop/message_loop.h"
18 #include "base/message_loop/message_pump_libevent.h" 20 #include "base/message_loop/message_pump_libevent.h"
19 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
20 #include "base/synchronization/lock.h" 22 #include "base/synchronization/lock.h"
21 #include "media/base/keyboard_event_counter.h" 23 #include "media/base/keyboard_event_counter.h"
22 #include "third_party/skia/include/core/SkPoint.h" 24 #include "third_party/skia/include/core/SkPoint.h"
23 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 25 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
24 #include "ui/gfx/x/x11_types.h" 26 #include "ui/gfx/x/x11_types.h"
25 27
26 // These includes need to be later than dictated by the style guide due to 28 // These includes need to be later than dictated by the style guide due to
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 } // namespace 376 } // namespace
375 377
376 scoped_ptr<UserInputMonitor> UserInputMonitor::Create( 378 scoped_ptr<UserInputMonitor> UserInputMonitor::Create(
377 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, 379 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
378 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) { 380 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
379 return scoped_ptr<UserInputMonitor>( 381 return scoped_ptr<UserInputMonitor>(
380 new UserInputMonitorLinux(io_task_runner)); 382 new UserInputMonitorLinux(io_task_runner));
381 } 383 }
382 384
383 } // namespace media 385 } // namespace media
OLDNEW
« no previous file with comments | « media/base/user_input_monitor.h ('k') | media/base/user_input_monitor_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698