encounter/engine
0
0
Fork 0
mirror of https://github.com/encounter/engine.git synced 2026-03-30 11:09:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to new way of passing application environment. (#3209)

Browse Source
This commit is contained in:
Jeff Brown
2016-11-08 16:58:18 -08:00
committed by GitHub
parent a3a13f4a94
commit a2bf3dc35a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content_handler/application_controller_impl.cc
+7 -5
View File
@@ -35,7 +35,7 @@ ApplicationControllerImpl::ApplicationControllerImpl(
}
// TODO(abarth): The Dart code should end up with outgoing_services.
if (startup_info->outgoing_services.is_pending()) {
if (startup_info->outgoing_services) {
service_provider_bindings_.AddBinding(
this, std::move(startup_info->outgoing_services));
}
@@ -43,10 +43,12 @@ ApplicationControllerImpl::ApplicationControllerImpl(
url_ = startup_info->url;
runtime_holder_.reset(new RuntimeHolder());
// TODO(abarth): The Dart code should end up with environment_services.
runtime_holder_->Init(modular::ServiceProviderPtr::Create(
std::move(startup_info->environment_services)),
std::move(bundle));
// TODO(abarth): The Dart code should end up with environment.
modular::ServiceProviderPtr environment_services;
modular::ApplicationEnvironmentPtr::Create(
std::move(startup_info->environment))
->GetServices(GetProxy(&environment_services));
runtime_holder_->Init(std::move(environment_services), std::move(bundle));
}
ApplicationControllerImpl::~ApplicationControllerImpl() = default;