summaryrefslogtreecommitdiffstats
path: root/chrome_frame/task_marshaller.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 04:48:49 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 04:48:49 +0000
commitc91775096768e4a75b23a910ddc1e33d9412a3be (patch)
treecb807f9b28d88b4950e41d32fbe73a5c81a94c40 /chrome_frame/task_marshaller.h
parente0eb450f398ae888aa0fbdb7fd3abc072d5846a2 (diff)
downloadchromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.zip
chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.gz
chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.bz2
Move non_thread_safe from base to base/threading and into the base namespace.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6005010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/task_marshaller.h')
-rw-r--r--chrome_frame/task_marshaller.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/task_marshaller.h b/chrome_frame/task_marshaller.h
index f0f6890..9fd3701 100644
--- a/chrome_frame/task_marshaller.h
+++ b/chrome_frame/task_marshaller.h
@@ -10,8 +10,9 @@
#include <deque>
#include <queue>
#include "base/lock.h"
-#include "base/non_thread_safe.h"
+#include "base/threading/non_thread_safe.h"
#include "base/time.h"
+
class Task;
namespace tracked_objects {
class Location;
@@ -21,7 +22,7 @@ namespace tracked_objects {
// in cases where we do not control the thread lifetime and message retrieval
// and dispatching. It uses a HWND to ::PostMessage to it as a signal that
// the task queue is not empty.
-class TaskMarshallerThroughMessageQueue : public NonThreadSafe {
+class TaskMarshallerThroughMessageQueue : public base::NonThreadSafe {
public:
TaskMarshallerThroughMessageQueue();
~TaskMarshallerThroughMessageQueue();