| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/child/child_thread_impl.h" | 5 #include "content/child/child_thread_impl.h" |
| 6 | 6 |
| 7 #include <signal.h> | 7 #include <signal.h> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 | 649 |
| 650 void ChildThreadImpl::RecordComputedAction(const std::string& action) { | 650 void ChildThreadImpl::RecordComputedAction(const std::string& action) { |
| 651 NOTREACHED(); | 651 NOTREACHED(); |
| 652 } | 652 } |
| 653 | 653 |
| 654 ServiceManagerConnection* ChildThreadImpl::GetServiceManagerConnection() { | 654 ServiceManagerConnection* ChildThreadImpl::GetServiceManagerConnection() { |
| 655 return service_manager_connection_.get(); | 655 return service_manager_connection_.get(); |
| 656 } | 656 } |
| 657 | 657 |
| 658 service_manager::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() { | 658 service_manager::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() { |
| 659 if (!interface_registry_.get()) | 659 if (!interface_registry_.get()) { |
| 660 interface_registry_.reset(new service_manager::InterfaceRegistry); | 660 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>( |
| 661 service_manager::Identity(), service_manager::InterfaceProviderSpec()); |
| 662 } |
| 661 return interface_registry_.get(); | 663 return interface_registry_.get(); |
| 662 } | 664 } |
| 663 | 665 |
| 664 service_manager::InterfaceProvider* ChildThreadImpl::GetRemoteInterfaces() { | 666 service_manager::InterfaceProvider* ChildThreadImpl::GetRemoteInterfaces() { |
| 665 if (browser_connection_) | 667 if (browser_connection_) |
| 666 return browser_connection_->GetRemoteInterfaces(); | 668 return browser_connection_->GetRemoteInterfaces(); |
| 667 | 669 |
| 668 if (!remote_interfaces_.get()) | 670 if (!remote_interfaces_.get()) |
| 669 remote_interfaces_.reset(new service_manager::InterfaceProvider); | 671 remote_interfaces_.reset(new service_manager::InterfaceProvider); |
| 670 return remote_interfaces_.get(); | 672 return remote_interfaces_.get(); |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 Listener* route = router_.GetRoute(routing_id); | 866 Listener* route = router_.GetRoute(routing_id); |
| 865 if (route) | 867 if (route) |
| 866 route->OnAssociatedInterfaceRequest(name, request.PassHandle()); | 868 route->OnAssociatedInterfaceRequest(name, request.PassHandle()); |
| 867 } | 869 } |
| 868 | 870 |
| 869 bool ChildThreadImpl::IsInBrowserProcess() const { | 871 bool ChildThreadImpl::IsInBrowserProcess() const { |
| 870 return static_cast<bool>(browser_process_io_runner_); | 872 return static_cast<bool>(browser_process_io_runner_); |
| 871 } | 873 } |
| 872 | 874 |
| 873 } // namespace content | 875 } // namespace content |
| OLD | NEW |