diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 04:17:22 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 04:17:22 +0000 |
commit | c9c0d079c24a02f8f9b667f3cbf06d234a586625 (patch) | |
tree | 3190175cc6bd419a1f36d3a9265c1c61e1ba9884 /remoting/host/client_session.cc | |
parent | 0c12ed8f62b3691f1fee9e5abd6b6bc2fa5af14a (diff) | |
download | chromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.zip chromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.tar.gz chromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session.cc')
-rw-r--r-- | remoting/host/client_session.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 297ee00..1aae53c 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -5,7 +5,6 @@ #include "remoting/host/client_session.h" #include "base/task.h" -#include "media/base/callback.h" #include "remoting/host/user_authenticator.h" #include "remoting/proto/auth.pb.h" @@ -28,7 +27,7 @@ ClientSession::~ClientSession() { void ClientSession::SuggestResolution( const protocol::SuggestResolutionRequest* msg, Task* done) { - media::AutoTaskRunner done_runner(done); + base::ScopedTaskRunner done_runner(done); if (!authenticated_) { LOG(WARNING) << "Invalid control message received " @@ -41,7 +40,7 @@ void ClientSession::BeginSessionRequest( const protocol::LocalLoginCredentials* credentials, Task* done) { DCHECK(event_handler_); - media::AutoTaskRunner done_runner(done); + base::ScopedTaskRunner done_runner(done); bool success = false; switch (credentials->type()) { @@ -70,19 +69,17 @@ void ClientSession::OnAuthorizationComplete(bool success) { void ClientSession::InjectKeyEvent(const protocol::KeyEvent* event, Task* done) { - media::AutoTaskRunner done_runner(done); + base::ScopedTaskRunner done_runner(done); if (authenticated_) { - done_runner.release(); - input_stub_->InjectKeyEvent(event, done); + input_stub_->InjectKeyEvent(event, done_runner.Release()); } } void ClientSession::InjectMouseEvent(const protocol::MouseEvent* event, Task* done) { - media::AutoTaskRunner done_runner(done); + base::ScopedTaskRunner done_runner(done); if (authenticated_) { - done_runner.release(); - input_stub_->InjectMouseEvent(event, done); + input_stub_->InjectMouseEvent(event, done_runner.Release()); } } |