diff options
Diffstat (limited to 'chrome/common/webmessageportchannel_impl.h')
| -rw-r--r-- | chrome/common/webmessageportchannel_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h index 0199ebb..846a546 100644 --- a/chrome/common/webmessageportchannel_impl.h +++ b/chrome/common/webmessageportchannel_impl.h @@ -10,11 +10,11 @@ #include <vector> #include "base/basictypes.h" -#include "base/lock.h" #include "base/string16.h" #include "base/ref_counted.h" +#include "base/synchronization/lock.h" #include "ipc/ipc_channel.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h" // This is thread safe. class WebMessagePortChannelImpl @@ -67,7 +67,7 @@ class WebMessagePortChannelImpl MessageQueue message_queue_; WebKit::WebMessagePortChannelClient* client_; - Lock lock_; // Locks access to above. + base::Lock lock_; // Locks access to above. int route_id_; // The routing id for this object. int message_port_id_; // A globally unique identifier for this message port. |