| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/cpp/application/application_impl_base.h" | 5 #include "mojo/public/cpp/application/application_impl_base.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "mojo/public/cpp/application/connection_context.h" | 10 #include "mojo/public/cpp/application/connection_context.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 // but currently tests fail if we don't just report "OK". | 51 // but currently tests fail if we don't just report "OK". |
| 52 Terminate(MOJO_RESULT_OK); | 52 Terminate(MOJO_RESULT_OK); |
| 53 }); | 53 }); |
| 54 url_ = url; | 54 url_ = url; |
| 55 args_ = args.To<std::vector<std::string>>(); | 55 args_ = args.To<std::vector<std::string>>(); |
| 56 OnInitialize(); | 56 OnInitialize(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void ApplicationImplBase::AcceptConnection( | 59 void ApplicationImplBase::AcceptConnection( |
| 60 const String& requestor_url, | 60 const String& requestor_url, |
| 61 InterfaceRequest<ServiceProvider> services, | 61 const String& url, |
| 62 InterfaceHandle<ServiceProvider> exposed_services, | 62 InterfaceRequest<ServiceProvider> services) { |
| 63 const String& url) { | |
| 64 // Note: The shell no longer actually connects |exposed_services|, so a) we | |
| 65 // never actually get valid |exposed_services| here, b) it should be OK to | |
| 66 // drop it on the floor. | |
| 67 MOJO_LOG_IF(ERROR, exposed_services) | |
| 68 << "DEPRECATED: exposed_services is going away"; | |
| 69 std::unique_ptr<ServiceProviderImpl> service_provider_impl( | 63 std::unique_ptr<ServiceProviderImpl> service_provider_impl( |
| 70 new ServiceProviderImpl( | 64 new ServiceProviderImpl( |
| 71 ConnectionContext(ConnectionContext::Type::INCOMING, requestor_url, | 65 ConnectionContext(ConnectionContext::Type::INCOMING, requestor_url, |
| 72 url), | 66 url), |
| 73 services.Pass())); | 67 services.Pass())); |
| 74 if (!OnAcceptConnection(service_provider_impl.get())) | 68 if (!OnAcceptConnection(service_provider_impl.get())) |
| 75 return; | 69 return; |
| 76 service_provider_impls_.push_back(std::move(service_provider_impl)); | 70 service_provider_impls_.push_back(std::move(service_provider_impl)); |
| 77 } | 71 } |
| 78 | 72 |
| 79 void ApplicationImplBase::RequestQuit() { | 73 void ApplicationImplBase::RequestQuit() { |
| 80 OnQuit(); | 74 OnQuit(); |
| 81 Terminate(MOJO_RESULT_OK); | 75 Terminate(MOJO_RESULT_OK); |
| 82 } | 76 } |
| 83 | 77 |
| 84 } // namespace mojo | 78 } // namespace mojo |
| OLD | NEW |