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

Side by Side Diff: ipc/ipc_sync_message_filter.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 | « ipc/ipc_sync_channel.cc ('k') | ipc/ipc_sync_message_filter.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 IPC_IPC_SYNC_MESSAGE_FILTER_H_ 5 #ifndef IPC_IPC_SYNC_MESSAGE_FILTER_H_
6 #define IPC_IPC_SYNC_MESSAGE_FILTER_H_ 6 #define IPC_IPC_SYNC_MESSAGE_FILTER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/lock.h"
11 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
11 #include "base/synchronization/lock.h"
12 #include "ipc/ipc_channel_proxy.h" 12 #include "ipc/ipc_channel_proxy.h"
13 #include "ipc/ipc_sync_message.h" 13 #include "ipc/ipc_sync_message.h"
14 #include <set> 14 #include <set>
15 15
16 namespace base { 16 namespace base {
17 class WaitableEvent; 17 class WaitableEvent;
18 } 18 }
19 19
20 class MessageLoop; 20 class MessageLoop;
21 21
(...skipping 29 matching lines...) Expand all
51 // The channel to which this filter was added. 51 // The channel to which this filter was added.
52 Channel* channel_; 52 Channel* channel_;
53 53
54 MessageLoop* listener_loop_; // The process's main thread. 54 MessageLoop* listener_loop_; // The process's main thread.
55 MessageLoop* io_loop_; // The message loop where the Channel lives. 55 MessageLoop* io_loop_; // The message loop where the Channel lives.
56 56
57 typedef std::set<PendingSyncMsg*> PendingSyncMessages; 57 typedef std::set<PendingSyncMsg*> PendingSyncMessages;
58 PendingSyncMessages pending_sync_messages_; 58 PendingSyncMessages pending_sync_messages_;
59 59
60 // Locks data members above. 60 // Locks data members above.
61 Lock lock_; 61 base::Lock lock_;
62 62
63 base::WaitableEvent* shutdown_event_; 63 base::WaitableEvent* shutdown_event_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(SyncMessageFilter); 65 DISALLOW_COPY_AND_ASSIGN(SyncMessageFilter);
66 }; 66 };
67 67
68 } // namespace IPC 68 } // namespace IPC
69 69
70 #endif // IPC_IPC_SYNC_MESSAGE_FILTER_H_ 70 #endif // IPC_IPC_SYNC_MESSAGE_FILTER_H_
OLDNEW
« no previous file with comments | « ipc/ipc_sync_channel.cc ('k') | ipc/ipc_sync_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698