Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5722)

Unified Diff: chrome/common/webmessageportchannel_impl.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/webmessageportchannel_impl.h ('k') | chrome/common/worker_thread_ticker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/webmessageportchannel_impl.cc
diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc
index 077887168806e700c29df623e37d044d0d97dd38..443fdc81987d2c95c8bd5004765926aaf5fadd9d 100644
--- a/chrome/common/webmessageportchannel_impl.cc
+++ b/chrome/common/webmessageportchannel_impl.cc
@@ -53,7 +53,7 @@ WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
void WebMessagePortChannelImpl::setClient(WebMessagePortChannelClient* client) {
// Must lock here since client_ is called on the main thread.
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
client_ = client;
}
@@ -105,7 +105,7 @@ void WebMessagePortChannelImpl::postMessage(
bool WebMessagePortChannelImpl::tryGetMessage(
WebString* message,
WebMessagePortChannelArray& channels) {
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
if (message_queue_.empty())
return false;
@@ -194,7 +194,7 @@ void WebMessagePortChannelImpl::OnMessage(
const string16& message,
const std::vector<int>& sent_message_port_ids,
const std::vector<int>& new_routing_ids) {
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
Message msg;
msg.message = message;
if (!sent_message_port_ids.empty()) {
@@ -215,7 +215,7 @@ void WebMessagePortChannelImpl::OnMessagedQueued() {
std::vector<QueuedMessage> queued_messages;
{
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
queued_messages.reserve(message_queue_.size());
while (!message_queue_.empty()) {
string16 message = message_queue_.front().message;
« no previous file with comments | « chrome/common/webmessageportchannel_impl.h ('k') | chrome/common/worker_thread_ticker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698