summaryrefslogtreecommitdiffstats
path: root/chrome_frame/sync_msg_reply_dispatcher.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 04:55:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 04:55:52 +0000
commit20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch)
tree6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome_frame/sync_msg_reply_dispatcher.h
parentc6e8346b56ab61b35845aefcf9b241c654fe1253 (diff)
downloadchromium_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/sync_msg_reply_dispatcher.h')
-rw-r--r--chrome_frame/sync_msg_reply_dispatcher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/sync_msg_reply_dispatcher.h b/chrome_frame/sync_msg_reply_dispatcher.h
index 7d47bd1..a168788 100644
--- a/chrome_frame/sync_msg_reply_dispatcher.h
+++ b/chrome_frame/sync_msg_reply_dispatcher.h
@@ -8,7 +8,7 @@
#include <deque>
#include "base/callback.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
#include "ipc/ipc_channel_proxy.h"
// Base class used to allow synchronous IPC messages to be sent and
@@ -113,7 +113,7 @@ class SyncMessageReplyDispatcher : public IPC::ChannelProxy::MessageFilter {
}
PendingSyncMessageQueue message_queue_;
- Lock message_queue_lock_;
+ base::Lock message_queue_lock_;
};
#endif // CHROME_FRAME_SYNC_MSG_REPLY_DISPATCHER_H_