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/lib/service_registry.h" | 10 #include "mojo/public/cpp/application/lib/service_registry.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 url_ = url; | 57 url_ = url; |
58 args_ = args.To<std::vector<std::string>>(); | 58 args_ = args.To<std::vector<std::string>>(); |
59 delegate_->Initialize(this); | 59 delegate_->Initialize(this); |
60 } | 60 } |
61 | 61 |
62 void ApplicationImpl::AcceptConnection( | 62 void ApplicationImpl::AcceptConnection( |
63 const String& requestor_url, | 63 const String& requestor_url, |
64 InterfaceRequest<ServiceProvider> services, | 64 InterfaceRequest<ServiceProvider> services, |
65 InterfaceHandle<ServiceProvider> exposed_services, | 65 InterfaceHandle<ServiceProvider> exposed_services, |
66 const String& url) { | 66 const String& url) { |
67 MOJO_LOG_IF(WARNING, exposed_services) | 67 // Note: The shell no longer actually connects |exposed_services|, so a) we |
68 << "DEPRECATION WARNING: exposed_services will soon go away"; | 68 // never actually get valid |exposed_services| here, b) it should be OK to |
| 69 // drop it on the floor. |
| 70 MOJO_LOG_IF(ERROR, exposed_services) |
| 71 << "DEPRECATED: exposed_services is going away"; |
69 std::unique_ptr<internal::ServiceRegistry> registry( | 72 std::unique_ptr<internal::ServiceRegistry> registry( |
70 new internal::ServiceRegistry(this, url, requestor_url, | 73 new internal::ServiceRegistry(url, requestor_url, services.Pass())); |
71 std::move(exposed_services), | |
72 services.Pass())); | |
73 if (!delegate_->ConfigureIncomingConnection(registry.get())) | 74 if (!delegate_->ConfigureIncomingConnection(registry.get())) |
74 return; | 75 return; |
75 incoming_service_registries_.push_back(std::move(registry)); | 76 incoming_service_registries_.push_back(std::move(registry)); |
76 } | 77 } |
77 | 78 |
78 void ApplicationImpl::RequestQuit() { | 79 void ApplicationImpl::RequestQuit() { |
79 delegate_->Quit(); | 80 delegate_->Quit(); |
80 Terminate(); | 81 Terminate(); |
81 } | 82 } |
82 | 83 |
83 } // namespace mojo | 84 } // namespace mojo |
OLD | NEW |