OLD | NEW |
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_context.h" | 5 #include "content/browser/mojo/mojo_shell_context.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 } | 266 } |
267 | 267 |
268 void MojoShellContext::ConnectToApplicationOnOwnThread( | 268 void MojoShellContext::ConnectToApplicationOnOwnThread( |
269 const GURL& url, | 269 const GURL& url, |
270 const GURL& requestor_url, | 270 const GURL& requestor_url, |
271 mojo::shell::mojom::InterfaceProviderRequest request, | 271 mojo::shell::mojom::InterfaceProviderRequest request, |
272 mojo::shell::mojom::InterfaceProviderPtr exposed_services, | 272 mojo::shell::mojom::InterfaceProviderPtr exposed_services, |
273 const mojo::shell::CapabilityFilter& filter, | 273 const mojo::shell::CapabilityFilter& filter, |
274 const mojo::shell::mojom::Shell::ConnectCallback& callback) { | 274 const mojo::shell::mojom::Shell::ConnectCallback& callback) { |
275 scoped_ptr<mojo::shell::ConnectParams> params(new mojo::shell::ConnectParams); | 275 scoped_ptr<mojo::shell::ConnectParams> params(new mojo::shell::ConnectParams); |
| 276 // TODO(beng): kUserRoot is obviously wrong. |
276 params->set_source( | 277 params->set_source( |
277 mojo::shell::Identity(requestor_url, std::string(), | 278 mojo::shell::Identity(requestor_url, std::string(), |
| 279 mojo::shell::mojom::Shell::kUserRoot, |
278 mojo::shell::GetPermissiveCapabilityFilter())); | 280 mojo::shell::GetPermissiveCapabilityFilter())); |
279 params->set_target(mojo::shell::Identity(url, std::string(), filter)); | 281 params->set_target(mojo::shell::Identity( |
| 282 url, std::string(), mojo::shell::mojom::Shell::kUserRoot, filter)); |
280 params->set_remote_interfaces(std::move(request)); | 283 params->set_remote_interfaces(std::move(request)); |
281 params->set_local_interfaces(std::move(exposed_services)); | 284 params->set_local_interfaces(std::move(exposed_services)); |
282 params->set_connect_callback(callback); | 285 params->set_connect_callback(callback); |
283 application_manager_->Connect(std::move(params)); | 286 application_manager_->Connect(std::move(params)); |
284 } | 287 } |
285 | 288 |
286 } // namespace content | 289 } // namespace content |
OLD | NEW |