diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome_frame/task_marshaller.h | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/task_marshaller.h')
| -rw-r--r-- | chrome_frame/task_marshaller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/task_marshaller.h b/chrome_frame/task_marshaller.h index 9fd3701..75d945e 100644 --- a/chrome_frame/task_marshaller.h +++ b/chrome_frame/task_marshaller.h @@ -9,7 +9,8 @@ #include <windows.h> #include <deque> #include <queue> -#include "base/lock.h" + +#include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" @@ -58,7 +59,7 @@ class TaskMarshallerThroughMessageQueue : public base::NonThreadSafe { std::priority_queue<DelayedTask> delayed_tasks_; std::queue<Task*> pending_tasks_; - Lock lock_; + base::Lock lock_; HWND wnd_; UINT msg_; int invoke_task_; |