| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "services/kiosk_wm/merged_service_provider.h" | 5 #include "services/kiosk_wm/merged_service_provider.h" |
| 6 | 6 |
| 7 namespace kiosk_wm { | 7 namespace kiosk_wm { |
| 8 | 8 |
| 9 MergedServiceProvider::MergedServiceProvider( | 9 MergedServiceProvider::MergedServiceProvider( |
| 10 mojo::ServiceProviderPtr exposed_services, | 10 mojo::ServiceProviderPtr exposed_services, |
| 11 mojo::InterfaceFactory<mojo::NavigatorHost>* factory) | 11 mojo::InterfaceFactory<mojo::NavigatorHost>* factory) |
| 12 : exposed_services_(exposed_services.Pass()), factory_(factory) { | 12 : exposed_services_(exposed_services.Pass()), factory_(factory) { |
| 13 } | 13 } |
| 14 | 14 |
| 15 MergedServiceProvider::~MergedServiceProvider() { | 15 MergedServiceProvider::~MergedServiceProvider() { |
| 16 } | 16 } |
| 17 | 17 |
| 18 mojo::ServiceProviderPtr MergedServiceProvider::GetServiceProviderPtr() { | 18 mojo::ServiceProviderPtr MergedServiceProvider::GetServiceProviderPtr() { |
| 19 mojo::ServiceProviderPtr sp; | 19 mojo::ServiceProviderPtr sp; |
| 20 binding_.reset(new mojo::Binding<mojo::ServiceProvider>(this, GetProxy(&sp))); | 20 binding_.reset(new mojo::Binding<mojo::ServiceProvider>(this, GetProxy(&sp))); |
| 21 return sp.Pass(); | 21 return sp; |
| 22 } | 22 } |
| 23 | 23 |
| 24 void MergedServiceProvider::ConnectToService( | 24 void MergedServiceProvider::ConnectToService( |
| 25 const mojo::String& interface_name, | 25 const mojo::String& interface_name, |
| 26 mojo::ScopedMessagePipeHandle pipe) { | 26 mojo::ScopedMessagePipeHandle pipe) { |
| 27 if (interface_name == mojo::NavigatorHost::Name_) { | 27 if (interface_name == mojo::NavigatorHost::Name_) { |
| 28 factory_->Create(nullptr, | 28 factory_->Create(nullptr, |
| 29 mojo::MakeRequest<mojo::NavigatorHost>(pipe.Pass())); | 29 mojo::MakeRequest<mojo::NavigatorHost>(pipe.Pass())); |
| 30 } else if (exposed_services_.get()) { | 30 } else if (exposed_services_.get()) { |
| 31 exposed_services_->ConnectToService(interface_name, pipe.Pass()); | 31 exposed_services_->ConnectToService(interface_name, pipe.Pass()); |
| 32 } | 32 } |
| 33 } | 33 } |
| 34 | 34 |
| 35 } // namespace kiosk_wm | 35 } // namespace kiosk_wm |
| OLD | NEW |