OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_application_host.h" | 5 #include "content/browser/mojo/mojo_application_host.h" |
6 | 6 |
7 #include "content/common/mojo/mojo_messages.h" | 7 #include "content/common/mojo/mojo_messages.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "ipc/ipc_sender.h" | 9 #include "ipc/ipc_sender.h" |
10 #include "mojo/embedder/platform_channel_pair.h" | 10 #include "mojo/embedder/platform_channel_pair.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 | 55 |
56 base::PlatformFile client_file = | 56 base::PlatformFile client_file = |
57 PlatformFileFromScopedPlatformHandle(client_handle_.Pass()); | 57 PlatformFileFromScopedPlatformHandle(client_handle_.Pass()); |
58 did_activate_ = sender->Send(new MojoMsg_Activate( | 58 did_activate_ = sender->Send(new MojoMsg_Activate( |
59 IPC::GetFileHandleForProcess(client_file, process_handle, true))); | 59 IPC::GetFileHandleForProcess(client_file, process_handle, true))); |
60 return did_activate_; | 60 return did_activate_; |
61 } | 61 } |
62 | 62 |
63 void MojoApplicationHost::ServiceProviderImpl::ConnectToService( | 63 void MojoApplicationHost::ServiceProviderImpl::ConnectToService( |
64 const mojo::String& url, | 64 const mojo::String& url, |
| 65 const mojo::String& name, |
65 mojo::ScopedMessagePipeHandle handle) { | 66 mojo::ScopedMessagePipeHandle handle) { |
66 // TODO(darin): Provide something meaningful here. | 67 // TODO(darin): Provide something meaningful here. |
67 } | 68 } |
68 | 69 |
69 } // namespace content | 70 } // namespace content |
OLD | NEW |