| 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 "mojo/public/shell/application.h" | 5 #include "mojo/public/cpp/shell/application.h" |
| 6 | 6 |
| 7 namespace mojo { | 7 namespace mojo { |
| 8 | 8 |
| 9 Application::Application(ScopedShellHandle shell_handle) | 9 Application::Application(ScopedShellHandle shell_handle) |
| 10 : internal::ServiceFactoryBase::Owner(shell_handle.Pass()) { | 10 : internal::ServiceFactoryBase::Owner(shell_handle.Pass()) { |
| 11 } | 11 } |
| 12 | 12 |
| 13 Application::Application(MojoHandle shell_handle) | 13 Application::Application(MojoHandle shell_handle) |
| 14 : internal::ServiceFactoryBase::Owner( | 14 : internal::ServiceFactoryBase::Owner( |
| 15 mojo::MakeScopedHandle(ShellHandle(shell_handle)).Pass()) {} | 15 mojo::MakeScopedHandle(ShellHandle(shell_handle)).Pass()) {} |
| (...skipping 29 matching lines...) Expand all Loading... |
| 45 ScopedMessagePipeHandle client_handle) { | 45 ScopedMessagePipeHandle client_handle) { |
| 46 // TODO(davemoore): This method must be overridden by an Application subclass | 46 // TODO(davemoore): This method must be overridden by an Application subclass |
| 47 // to dispatch to the right ServiceFactory. We need to figure out an approach | 47 // to dispatch to the right ServiceFactory. We need to figure out an approach |
| 48 // to registration to make this better. | 48 // to registration to make this better. |
| 49 assert(1 == service_factories_.size()); | 49 assert(1 == service_factories_.size()); |
| 50 return service_factories_.front()->AcceptConnection(url.To<std::string>(), | 50 return service_factories_.front()->AcceptConnection(url.To<std::string>(), |
| 51 client_handle.Pass()); | 51 client_handle.Pass()); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace mojo | 54 } // namespace mojo |
| OLD | NEW |