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

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

Issue 1687693002: Rename ConnectToService to ConnectToInterface() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sp2
Patch Set: . Created 4 years, 10 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 #include "content/browser/mojo/mojo_shell_client_host.h" 5 #include "content/browser/mojo/mojo_shell_client_host.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 void ConnectChildToShell( 113 void ConnectChildToShell(
114 int child_process_id, 114 int child_process_id,
115 base::WeakPtr<RenderProcessHost> render_process_host, 115 base::WeakPtr<RenderProcessHost> render_process_host,
116 mojo::InterfaceRequest<mojo::shell::mojom::PIDReceiver> request, 116 mojo::InterfaceRequest<mojo::shell::mojom::PIDReceiver> request,
117 mojo::ScopedMessagePipeHandle pipe) { 117 mojo::ScopedMessagePipeHandle pipe) {
118 if (!render_process_host) 118 if (!render_process_host)
119 return; 119 return;
120 120
121 mojo::shell::mojom::ApplicationManagerPtr application_manager; 121 mojo::shell::mojom::ApplicationManagerPtr application_manager;
122 MojoShellConnection::Get()->GetShell()->ConnectToService( 122 MojoShellConnection::Get()->GetShell()->ConnectToInterface(
123 "mojo:shell", &application_manager); 123 "mojo:shell", &application_manager);
124 124
125 // The content of the URL/qualifier we pass is actually meaningless, it's only 125 // The content of the URL/qualifier we pass is actually meaningless, it's only
126 // important that they're unique per process. 126 // important that they're unique per process.
127 // TODO(beng): We need to specify a restrictive CapabilityFilter here that 127 // TODO(beng): We need to specify a restrictive CapabilityFilter here that
128 // matches the needs of the target process. Figure out where that 128 // matches the needs of the target process. Figure out where that
129 // specification is best determined (not here, this is a common 129 // specification is best determined (not here, this is a common
130 // chokepoint for all process types) and how to wire it through. 130 // chokepoint for all process types) and how to wire it through.
131 // http://crbug.com/555393 131 // http://crbug.com/555393
132 std::string url = 132 std::string url =
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 RenderProcessHost* render_process_host) { 200 RenderProcessHost* render_process_host) {
201 InstanceShellHandle* client_file = static_cast<InstanceShellHandle*>( 201 InstanceShellHandle* client_file = static_cast<InstanceShellHandle*>(
202 render_process_host->GetUserData(kMojoPlatformFile)); 202 render_process_host->GetUserData(kMojoPlatformFile));
203 if (!client_file) 203 if (!client_file)
204 return; 204 return;
205 render_process_host->Send(new MojoMsg_BindExternalMojoShellHandle( 205 render_process_host->Send(new MojoMsg_BindExternalMojoShellHandle(
206 IPC::GetFileHandleForProcess(client_file->get(), process_handle, true))); 206 IPC::GetFileHandleForProcess(client_file->get(), process_handle, true)));
207 } 207 }
208 208
209 } // namespace content 209 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_app_connection_impl.cc ('k') | content/browser/mojo_shell_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698