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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « ipc/mojo/async_handle_waiter_unittest.cc ('k') | ipc/mojo/ipc_channel_mojo.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 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 "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "ipc/ipc_channel.h" 14 #include "ipc/ipc_channel.h"
15 #include "ipc/ipc_channel_factory.h" 15 #include "ipc/ipc_channel_factory.h"
16 #include "ipc/ipc_export.h" 16 #include "ipc/ipc_export.h"
17 #include "ipc/mojo/ipc_message_pipe_reader.h" 17 #include "ipc/mojo/ipc_message_pipe_reader.h"
18 #include "ipc/mojo/ipc_mojo_bootstrap.h" 18 #include "ipc/mojo/ipc_mojo_bootstrap.h"
19 #include "ipc/mojo/scoped_ipc_support.h" 19 #include "ipc/mojo/scoped_ipc_support.h"
20 #include "mojo/public/cpp/system/core.h"
20 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" 21 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
21 #include "third_party/mojo/src/mojo/public/cpp/system/core.h"
22 22
23 namespace IPC { 23 namespace IPC {
24 24
25 // Mojo-based IPC::Channel implementation over a platform handle. 25 // Mojo-based IPC::Channel implementation over a platform handle.
26 // 26 //
27 // ChannelMojo builds Mojo MessagePipe using underlying pipe given by 27 // ChannelMojo builds Mojo MessagePipe using underlying pipe given by
28 // "bootstrap" IPC::Channel which creates and owns platform pipe like 28 // "bootstrap" IPC::Channel which creates and owns platform pipe like
29 // named socket. The bootstrap Channel is used only for establishing 29 // named socket. The bootstrap Channel is used only for establishing
30 // the underlying connection. ChannelMojo takes its handle over once 30 // the underlying connection. ChannelMojo takes its handle over once
31 // the it is made and puts MessagePipe on it. 31 // the it is made and puts MessagePipe on it.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 scoped_ptr<ScopedIPCSupport> ipc_support_; 168 scoped_ptr<ScopedIPCSupport> ipc_support_;
169 169
170 base::WeakPtrFactory<ChannelMojo> weak_factory_; 170 base::WeakPtrFactory<ChannelMojo> weak_factory_;
171 171
172 DISALLOW_COPY_AND_ASSIGN(ChannelMojo); 172 DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
173 }; 173 };
174 174
175 } // namespace IPC 175 } // namespace IPC
176 176
177 #endif // IPC_IPC_CHANNEL_MOJO_H_ 177 #endif // IPC_IPC_CHANNEL_MOJO_H_
OLDNEW
« no previous file with comments | « ipc/mojo/async_handle_waiter_unittest.cc ('k') | ipc/mojo/ipc_channel_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698