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

Side by Side Diff: content/browser/mojo/mojo_shell_client_host.h

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 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
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_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_ 5 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_
6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_ 6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
11 #include "mojo/edk/embedder/scoped_platform_handle.h"
11 #include "mojo/shell/public/interfaces/shell.mojom.h" 12 #include "mojo/shell/public/interfaces/shell.mojom.h"
12 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 class RenderProcessHost; 16 class RenderProcessHost;
17 17
18 // Creates a communication channel between the external Mojo shell and the 18 // Creates a communication channel between the external Mojo shell and the
19 // child. The server handle of this channel is shared with the external shell 19 // child. The server handle of this channel is shared with the external shell
20 // via Mojo IPC. |child_process_id| is used to uniquify the child in the 20 // via Mojo IPC. |child_process_id| is used to uniquify the child in the
21 // external shell's instance map. 21 // external shell's instance map.
22 void RegisterChildWithExternalShell(int child_process_id, 22 void RegisterChildWithExternalShell(int child_process_id,
(...skipping 10 matching lines...) Expand all
33 RenderProcessHost* render_process_host); 33 RenderProcessHost* render_process_host);
34 34
35 // Constructs a Capability Filter for the renderer's application instance in the 35 // Constructs a Capability Filter for the renderer's application instance in the
36 // external shell. This contains the restrictions imposed on what applications 36 // external shell. This contains the restrictions imposed on what applications
37 // and interfaces the renderer can see. The implementation lives in 37 // and interfaces the renderer can see. The implementation lives in
38 // renderer_capability_filter.cc so that it can be subject to specific security 38 // renderer_capability_filter.cc so that it can be subject to specific security
39 // review. 39 // review.
40 mojo::CapabilityFilterPtr CreateCapabilityFilterForRenderer(); 40 mojo::CapabilityFilterPtr CreateCapabilityFilterForRenderer();
41 41
42 // Used for the broker in the new EDK. 42 // Used for the broker in the new EDK.
43 mojo::embedder::ScopedPlatformHandle RegisterProcessWithBroker( 43 mojo::edk::ScopedPlatformHandle RegisterProcessWithBroker(
44 base::ProcessId pid); 44 base::ProcessId pid);
45 45
46 } // namespace content 46 } // namespace content
47 47
48 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_ 48 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CLIENT_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_application_host.cc ('k') | content/browser/mojo/mojo_shell_client_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698