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

Side by Side Diff: ipc/mojo/ipc_channel_mojo.h

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 years, 1 month 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
« no previous file with comments | « extensions/test/data/api_test_base_unittest.js ('k') | ipc/mojo/ipc_channel_mojo_readers.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHANNEL_MOJO_H_ 5 #ifndef IPC_IPC_CHANNEL_MOJO_H_
6 #define IPC_IPC_CHANNEL_MOJO_H_ 6 #define IPC_IPC_CHANNEL_MOJO_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "ipc/ipc_channel.h" 13 #include "ipc/ipc_channel.h"
14 #include "ipc/ipc_channel_factory.h" 14 #include "ipc/ipc_channel_factory.h"
15 #include "ipc/ipc_export.h" 15 #include "ipc/ipc_export.h"
16 #include "ipc/mojo/ipc_message_pipe_reader.h" 16 #include "ipc/mojo/ipc_message_pipe_reader.h"
17 #include "ipc/mojo/ipc_mojo_bootstrap.h" 17 #include "ipc/mojo/ipc_mojo_bootstrap.h"
18 #include "mojo/edk/embedder/channel_info_forward.h"
18 #include "mojo/public/cpp/system/core.h" 19 #include "mojo/public/cpp/system/core.h"
19 20
20 namespace mojo {
21 namespace embedder {
22 struct ChannelInfo;
23 }
24 }
25
26 namespace IPC { 21 namespace IPC {
27 22
28 namespace internal { 23 namespace internal {
29 class ControlReader; 24 class ControlReader;
30 class ServerControlReader; 25 class ServerControlReader;
31 class ClientControlReader; 26 class ClientControlReader;
32 class MessageReader; 27 class MessageReader;
33 } 28 }
34 29
35 // Mojo-based IPC::Channel implementation over a platform handle. 30 // Mojo-based IPC::Channel implementation over a platform handle.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 ScopedVector<Message> pending_messages_; 153 ScopedVector<Message> pending_messages_;
159 154
160 base::WeakPtrFactory<ChannelMojo> weak_factory_; 155 base::WeakPtrFactory<ChannelMojo> weak_factory_;
161 156
162 DISALLOW_COPY_AND_ASSIGN(ChannelMojo); 157 DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
163 }; 158 };
164 159
165 } // namespace IPC 160 } // namespace IPC
166 161
167 #endif // IPC_IPC_CHANNEL_MOJO_H_ 162 #endif // IPC_IPC_CHANNEL_MOJO_H_
OLDNEW
« no previous file with comments | « extensions/test/data/api_test_base_unittest.js ('k') | ipc/mojo/ipc_channel_mojo_readers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698