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

Side by Side Diff: content/common/mojo/channel_init.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 | « content/common/BUILD.gn ('k') | content/common/mojo/service_registry_impl.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CONTENT_COMMON_MOJO_CHANNEL_INIT_H_ 5 #ifndef CONTENT_COMMON_MOJO_CHANNEL_INIT_H_
6 #define CONTENT_COMMON_MOJO_CHANNEL_INIT_H_ 6 #define CONTENT_COMMON_MOJO_CHANNEL_INIT_H_
7 7
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "ipc/mojo/scoped_ipc_support.h" 12 #include "ipc/mojo/scoped_ipc_support.h"
13 #include "mojo/public/cpp/system/message_pipe.h"
13 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" 14 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
14 #include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
15 15
16 namespace base { 16 namespace base {
17 class TaskRunner; 17 class TaskRunner;
18 } 18 }
19 19
20 namespace content { 20 namespace content {
21 21
22 // ChannelInit handles creation and destruction of the Mojo channel. It is not 22 // ChannelInit handles creation and destruction of the Mojo channel. It is not
23 // thread-safe, but may be used on any single thread with a MessageLoop. 23 // thread-safe, but may be used on any single thread with a MessageLoop.
24 class CONTENT_EXPORT ChannelInit { 24 class CONTENT_EXPORT ChannelInit {
(...skipping 24 matching lines...) Expand all
49 49
50 scoped_ptr<IPC::ScopedIPCSupport> ipc_support_; 50 scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
51 base::WeakPtrFactory<ChannelInit> weak_factory_; 51 base::WeakPtrFactory<ChannelInit> weak_factory_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(ChannelInit); 53 DISALLOW_COPY_AND_ASSIGN(ChannelInit);
54 }; 54 };
55 55
56 } // namespace content 56 } // namespace content
57 57
58 #endif // CONTENT_COMMON_MOJO_CHANNEL_INIT_H_ 58 #endif // CONTENT_COMMON_MOJO_CHANNEL_INIT_H_
OLDNEW
« no previous file with comments | « content/common/BUILD.gn ('k') | content/common/mojo/service_registry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698