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

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

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 9 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
« no previous file with comments | « media/base/text_renderer.cc ('k') | media/base/user_input_monitor_win.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 <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/memory/weak_ptr.h"
19 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
20 #include "base/message_loop/message_pump_libevent.h" 19 #include "base/message_loop/message_pump_libevent.h"
21 #include "base/single_thread_task_runner.h" 20 #include "base/single_thread_task_runner.h"
22 #include "base/synchronization/lock.h" 21 #include "base/synchronization/lock.h"
23 #include "media/base/keyboard_event_counter.h" 22 #include "media/base/keyboard_event_counter.h"
24 #include "third_party/skia/include/core/SkPoint.h" 23 #include "third_party/skia/include/core/SkPoint.h"
25 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 24 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
26 25
27 // 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
28 // Xlib header pollution, specifically the min, max, and Status macros. 27 // Xlib header pollution, specifically the min, max, and Status macros.
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 } // namespace 373 } // namespace
375 374
376 scoped_ptr<UserInputMonitor> UserInputMonitor::Create( 375 scoped_ptr<UserInputMonitor> UserInputMonitor::Create(
377 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, 376 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
378 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) { 377 const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
379 return scoped_ptr<UserInputMonitor>( 378 return scoped_ptr<UserInputMonitor>(
380 new UserInputMonitorLinux(io_task_runner)); 379 new UserInputMonitorLinux(io_task_runner));
381 } 380 }
382 381
383 } // namespace media 382 } // namespace media
OLDNEW
« no previous file with comments | « media/base/text_renderer.cc ('k') | media/base/user_input_monitor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698