diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
| commit | fb441961d60063478f9c4e8cf57b9968f28e6aef (patch) | |
| tree | 87666bee60c026723969d4749e6d3500467194c4 /remoting | |
| parent | a15385f81cdeab34ce44b2f7648a162fcea371a3 (diff) | |
| download | chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.zip chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.gz chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.bz2 | |
Revert 198844 "Move sequenced_task_runner to base/task"
Reverting revisions that rely on r198820 so to unbreak the build.
> Move sequenced_task_runner to base/task
>
> BUG=
> R=akalin@chromium.org
>
> Review URL: https://codereview.chromium.org/14927008
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/client_session.h | 2 | ||||
| -rw-r--r-- | remoting/host/desktop_session_proxy.h | 2 | ||||
| -rw-r--r-- | remoting/host/setup/native_messaging_reader.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index afcd37a..add2a0a 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h index 060d132..34eac55 100644 --- a/remoting/host/desktop_session_proxy.h +++ b/remoting/host/desktop_session_proxy.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/process.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" #include "media/video/capture/screen/screen_capturer.h" diff --git a/remoting/host/setup/native_messaging_reader.cc b/remoting/host/setup/native_messaging_reader.cc index b182461..e98ac52 100644 --- a/remoting/host/setup/native_messaging_reader.cc +++ b/remoting/host/setup/native_messaging_reader.cc @@ -9,9 +9,9 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/location.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" |