| 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/cpp/application/application_impl.h" | 5 #include "mojo/public/cpp/application/application_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/connection_context.h" | 10 #include "mojo/public/cpp/application/connection_context.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // Note: The shell no longer actually connects |exposed_services|, so a) we | 68 // Note: The shell no longer actually connects |exposed_services|, so a) we |
| 69 // never actually get valid |exposed_services| here, b) it should be OK to | 69 // never actually get valid |exposed_services| here, b) it should be OK to |
| 70 // drop it on the floor. | 70 // drop it on the floor. |
| 71 MOJO_LOG_IF(ERROR, exposed_services) | 71 MOJO_LOG_IF(ERROR, exposed_services) |
| 72 << "DEPRECATED: exposed_services is going away"; | 72 << "DEPRECATED: exposed_services is going away"; |
| 73 std::unique_ptr<internal::ServiceRegistry> registry( | 73 std::unique_ptr<internal::ServiceRegistry> registry( |
| 74 new internal::ServiceRegistry( | 74 new internal::ServiceRegistry( |
| 75 ConnectionContext(ConnectionContext::Type::INCOMING, requestor_url, | 75 ConnectionContext(ConnectionContext::Type::INCOMING, requestor_url, |
| 76 url), | 76 url), |
| 77 services.Pass())); | 77 services.Pass())); |
| 78 if (!delegate_->ConfigureIncomingConnection(registry.get())) | 78 if (!delegate_->ConfigureIncomingConnection( |
| 79 ®istry->GetServiceProviderImpl())) |
| 79 return; | 80 return; |
| 80 incoming_service_registries_.push_back(std::move(registry)); | 81 incoming_service_registries_.push_back(std::move(registry)); |
| 81 } | 82 } |
| 82 | 83 |
| 83 void ApplicationImpl::RequestQuit() { | 84 void ApplicationImpl::RequestQuit() { |
| 84 delegate_->Quit(); | 85 delegate_->Quit(); |
| 85 Terminate(); | 86 Terminate(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 } // namespace mojo | 89 } // namespace mojo |
| OLD | NEW |