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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 void ChildThreadImpl::RecordComputedAction(const std::string& action) { | 628 void ChildThreadImpl::RecordComputedAction(const std::string& action) { |
629 NOTREACHED(); | 629 NOTREACHED(); |
630 } | 630 } |
631 | 631 |
632 MojoShellConnection* ChildThreadImpl::GetMojoShellConnection() { | 632 MojoShellConnection* ChildThreadImpl::GetMojoShellConnection() { |
633 return mojo_shell_connection_.get(); | 633 return mojo_shell_connection_.get(); |
634 } | 634 } |
635 | 635 |
636 shell::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() { | 636 shell::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() { |
637 if (!interface_registry_.get()) | 637 if (!interface_registry_.get()) |
638 interface_registry_.reset(new shell::InterfaceRegistry(nullptr)); | 638 interface_registry_.reset(new shell::InterfaceRegistry); |
639 return interface_registry_.get(); | 639 return interface_registry_.get(); |
640 } | 640 } |
641 | 641 |
642 shell::InterfaceProvider* ChildThreadImpl::GetRemoteInterfaces() { | 642 shell::InterfaceProvider* ChildThreadImpl::GetRemoteInterfaces() { |
643 if (browser_connection_) | 643 if (browser_connection_) |
644 return browser_connection_->GetRemoteInterfaces(); | 644 return browser_connection_->GetRemoteInterfaces(); |
645 | 645 |
646 if (!remote_interfaces_.get()) | 646 if (!remote_interfaces_.get()) |
647 remote_interfaces_.reset(new shell::InterfaceProvider); | 647 remote_interfaces_.reset(new shell::InterfaceProvider); |
648 return remote_interfaces_.get(); | 648 return remote_interfaces_.get(); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
803 void ChildThreadImpl::EnsureConnected() { | 803 void ChildThreadImpl::EnsureConnected() { |
804 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; | 804 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; |
805 base::Process::Current().Terminate(0, false); | 805 base::Process::Current().Terminate(0, false); |
806 } | 806 } |
807 | 807 |
808 bool ChildThreadImpl::IsInBrowserProcess() const { | 808 bool ChildThreadImpl::IsInBrowserProcess() const { |
809 return static_cast<bool>(browser_process_io_runner_); | 809 return static_cast<bool>(browser_process_io_runner_); |
810 } | 810 } |
811 | 811 |
812 } // namespace content | 812 } // namespace content |
OLD | NEW |