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

Side by Side Diff: chrome/common/webmessageportchannel_impl.h

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/sqlite_utils.cc ('k') | chrome/common/webmessageportchannel_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_ 5 #ifndef CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
6 #define CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_ 6 #define CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <queue> 9 #include <queue>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/lock.h"
14 #include "base/string16.h" 13 #include "base/string16.h"
15 #include "base/ref_counted.h" 14 #include "base/ref_counted.h"
15 #include "base/synchronization/lock.h"
16 #include "ipc/ipc_channel.h" 16 #include "ipc/ipc_channel.h"
17 #include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h" 17 #include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h"
18 18
19 // This is thread safe. 19 // This is thread safe.
20 class WebMessagePortChannelImpl 20 class WebMessagePortChannelImpl
21 : public WebKit::WebMessagePortChannel, 21 : public WebKit::WebMessagePortChannel,
22 public IPC::Channel::Listener, 22 public IPC::Channel::Listener,
23 public base::RefCountedThreadSafe<WebMessagePortChannelImpl> { 23 public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
24 public: 24 public:
25 WebMessagePortChannelImpl(); 25 WebMessagePortChannelImpl();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 ~Message(); 60 ~Message();
61 61
62 string16 message; 62 string16 message;
63 std::vector<WebMessagePortChannelImpl*> ports; 63 std::vector<WebMessagePortChannelImpl*> ports;
64 }; 64 };
65 65
66 typedef std::queue<Message> MessageQueue; 66 typedef std::queue<Message> MessageQueue;
67 MessageQueue message_queue_; 67 MessageQueue message_queue_;
68 68
69 WebKit::WebMessagePortChannelClient* client_; 69 WebKit::WebMessagePortChannelClient* client_;
70 Lock lock_; // Locks access to above. 70 base::Lock lock_; // Locks access to above.
71 71
72 int route_id_; // The routing id for this object. 72 int route_id_; // The routing id for this object.
73 int message_port_id_; // A globally unique identifier for this message port. 73 int message_port_id_; // A globally unique identifier for this message port.
74 74
75 DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl); 75 DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl);
76 }; 76 };
77 77
78 #endif // CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_ 78 #endif // CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/common/sqlite_utils.cc ('k') | chrome/common/webmessageportchannel_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698