diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 05:06:04 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 05:06:04 +0000 |
| commit | d0870532614ec8fa68782a55a013d3da41a9175b (patch) | |
| tree | a293500da5b10a4c2c54845f84c6e6265057d807 /remoting/host/event_executor_mac.cc | |
| parent | c9c0d079c24a02f8f9b667f3cbf06d234a586625 (diff) | |
| download | chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.zip chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.tar.gz chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.tar.bz2 | |
1;2305;0cRevert 86971 - Move media library AutoTaskRunner to base and rename ScopedTaskRunner.
This is needed to avoid faux dependencies on media/ creeping in to remoting/ code, and creating linker issues.
BUG=
TEST=Everything works as before.
Review URL: http://codereview.chromium.org/7062013
TBR=wez@chromium.org
Review URL: http://codereview.chromium.org/7062042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/event_executor_mac.cc')
| -rw-r--r-- | remoting/host/event_executor_mac.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/host/event_executor_mac.cc b/remoting/host/event_executor_mac.cc index 4c65c28..a197bf6 100644 --- a/remoting/host/event_executor_mac.cc +++ b/remoting/host/event_executor_mac.cc @@ -12,6 +12,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/message_loop.h" #include "base/task.h" +#include "media/base/callback.h" #include "remoting/host/capturer.h" #include "remoting/proto/internal.pb.h" #include "remoting/protocol/message_decoder.h" @@ -214,7 +215,7 @@ const int kUsVkeyToKeysym[256] = { }; void EventExecutorMac::InjectKeyEvent(const KeyEvent* event, Task* done) { - base::ScopedTaskRunner done_runner(done); + media::AutoTaskRunner done_runner(done); int key_code = event->keycode(); if (key_code >= 0 && key_code < 256) { @@ -250,7 +251,7 @@ void EventExecutorMac::InjectKeyEvent(const KeyEvent* event, Task* done) { } void EventExecutorMac::InjectMouseEvent(const MouseEvent* event, Task* done) { - base::ScopedTaskRunner done_runner(done); + media::AutoTaskRunner done_runner(done); if (event->has_x() && event->has_y()) { // TODO(wez): Checking the validity of the MouseEvent should be done in core |