| OLD | NEW |
| 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/event_executor.h" | 5 #include "remoting/host/event_executor.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
| 10 #include <X11/XF86keysym.h> | 10 #include <X11/XF86keysym.h> |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 | 429 |
| 430 void EventExecutorLinux::OnSessionFinished() { | 430 void EventExecutorLinux::OnSessionFinished() { |
| 431 return; | 431 return; |
| 432 } | 432 } |
| 433 | 433 |
| 434 } // namespace | 434 } // namespace |
| 435 | 435 |
| 436 scoped_ptr<EventExecutor> EventExecutor::Create( | 436 scoped_ptr<EventExecutor> EventExecutor::Create( |
| 437 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, | 437 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
| 438 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 438 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 439 Capturer* capturer) { | 439 VideoFrameCapturer* capturer) { |
| 440 scoped_ptr<EventExecutorLinux> executor( | 440 scoped_ptr<EventExecutorLinux> executor( |
| 441 new EventExecutorLinux(main_task_runner)); | 441 new EventExecutorLinux(main_task_runner)); |
| 442 if (!executor->Init()) | 442 if (!executor->Init()) |
| 443 return scoped_ptr<EventExecutor>(NULL); | 443 return scoped_ptr<EventExecutor>(NULL); |
| 444 return executor.PassAs<EventExecutor>(); | 444 return executor.PassAs<EventExecutor>(); |
| 445 } | 445 } |
| 446 | 446 |
| 447 } // namespace remoting | 447 } // namespace remoting |
| OLD | NEW |