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_app_connection_impl.h" | 5 #include "content/browser/mojo/mojo_app_connection_impl.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "content/browser/mojo/mojo_shell_context.h" | 11 #include "content/browser/mojo/mojo_shell_context.h" |
11 #include "mojo/shell/capability_filter.h" | 12 #include "mojo/shell/capability_filter.h" |
12 | 13 |
13 namespace content { | 14 namespace content { |
14 | 15 |
15 const char kBrowserMojoAppUrl[] = "system:content_browser"; | 16 const char kBrowserMojoAppUrl[] = "system:content_browser"; |
16 | 17 |
17 namespace { | 18 namespace { |
(...skipping 15 matching lines...) Expand all Loading... |
33 mojo::ServiceProviderPtr(), mojo::shell::GetPermissiveCapabilityFilter(), | 34 mojo::ServiceProviderPtr(), mojo::shell::GetPermissiveCapabilityFilter(), |
34 base::Bind(&OnGotContentHandlerID)); | 35 base::Bind(&OnGotContentHandlerID)); |
35 } | 36 } |
36 | 37 |
37 MojoAppConnectionImpl::~MojoAppConnectionImpl() { | 38 MojoAppConnectionImpl::~MojoAppConnectionImpl() { |
38 } | 39 } |
39 | 40 |
40 void MojoAppConnectionImpl::ConnectToService( | 41 void MojoAppConnectionImpl::ConnectToService( |
41 const std::string& service_name, | 42 const std::string& service_name, |
42 mojo::ScopedMessagePipeHandle handle) { | 43 mojo::ScopedMessagePipeHandle handle) { |
43 services_->ConnectToService(service_name, handle.Pass()); | 44 services_->ConnectToService(service_name, std::move(handle)); |
44 } | 45 } |
45 | 46 |
46 } // namespace content | 47 } // namespace content |
OLD | NEW |