| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 params->set_source( | 276 params->set_source( |
| 277 mojo::shell::Identity(requestor_url, std::string(), | 277 mojo::shell::Identity(requestor_url, std::string(), |
| 278 mojo::shell::GetPermissiveCapabilityFilter())); | 278 mojo::shell::GetPermissiveCapabilityFilter())); |
| 279 params->set_target(mojo::shell::Identity(url, std::string(), filter)); | 279 params->set_target(mojo::shell::Identity(url, std::string(), filter)); |
| 280 params->set_remote_interfaces(std::move(request)); | 280 params->set_remote_interfaces(std::move(request)); |
| 281 params->set_local_interfaces(std::move(exposed_services)); | 281 params->set_local_interfaces(std::move(exposed_services)); |
| 282 params->set_on_application_end(base::Bind(&base::DoNothing)); | |
| 283 params->set_connect_callback(callback); | 282 params->set_connect_callback(callback); |
| 284 application_manager_->Connect(std::move(params)); | 283 application_manager_->Connect(std::move(params)); |
| 285 } | 284 } |
| 286 | 285 |
| 287 } // namespace content | 286 } // namespace content |
| OLD | NEW |