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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 #include "content/child/thread_safe_sender.h" | 52 #include "content/child/thread_safe_sender.h" |
53 #include "content/child/websocket_dispatcher.h" | 53 #include "content/child/websocket_dispatcher.h" |
54 #include "content/child/websocket_message_filter.h" | 54 #include "content/child/websocket_message_filter.h" |
55 #include "content/common/child_process_messages.h" | 55 #include "content/common/child_process_messages.h" |
56 #include "content/common/in_process_child_thread_params.h" | 56 #include "content/common/in_process_child_thread_params.h" |
57 #include "content/common/mojo/mojo_shell_connection_impl.h" | 57 #include "content/common/mojo/mojo_shell_connection_impl.h" |
58 #include "content/public/common/content_switches.h" | 58 #include "content/public/common/content_switches.h" |
59 #include "content/public/common/mojo_channel_switches.h" | 59 #include "content/public/common/mojo_channel_switches.h" |
60 #include "ipc/attachment_broker.h" | 60 #include "ipc/attachment_broker.h" |
61 #include "ipc/attachment_broker_unprivileged.h" | 61 #include "ipc/attachment_broker_unprivileged.h" |
| 62 #include "ipc/ipc_channel_mojo.h" |
62 #include "ipc/ipc_logging.h" | 63 #include "ipc/ipc_logging.h" |
63 #include "ipc/ipc_platform_file.h" | 64 #include "ipc/ipc_platform_file.h" |
64 #include "ipc/ipc_switches.h" | 65 #include "ipc/ipc_switches.h" |
65 #include "ipc/ipc_sync_channel.h" | 66 #include "ipc/ipc_sync_channel.h" |
66 #include "ipc/ipc_sync_message_filter.h" | 67 #include "ipc/ipc_sync_message_filter.h" |
67 #include "ipc/mojo/ipc_channel_mojo.h" | |
68 #include "mojo/edk/embedder/embedder.h" | 68 #include "mojo/edk/embedder/embedder.h" |
69 #include "mojo/edk/embedder/named_platform_channel_pair.h" | 69 #include "mojo/edk/embedder/named_platform_channel_pair.h" |
70 #include "mojo/edk/embedder/platform_channel_pair.h" | 70 #include "mojo/edk/embedder/platform_channel_pair.h" |
71 #include "mojo/edk/embedder/scoped_ipc_support.h" | 71 #include "mojo/edk/embedder/scoped_ipc_support.h" |
72 #include "services/shell/runner/common/client_util.h" | 72 #include "services/shell/runner/common/client_util.h" |
73 | 73 |
74 #if defined(OS_POSIX) | 74 #if defined(OS_POSIX) |
75 #include "base/posix/global_descriptors.h" | 75 #include "base/posix/global_descriptors.h" |
76 #include "content/public/common/content_descriptors.h" | 76 #include "content/public/common/content_descriptors.h" |
77 #endif | 77 #endif |
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 void ChildThreadImpl::EnsureConnected() { | 743 void ChildThreadImpl::EnsureConnected() { |
744 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; | 744 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; |
745 base::Process::Current().Terminate(0, false); | 745 base::Process::Current().Terminate(0, false); |
746 } | 746 } |
747 | 747 |
748 bool ChildThreadImpl::IsInBrowserProcess() const { | 748 bool ChildThreadImpl::IsInBrowserProcess() const { |
749 return static_cast<bool>(browser_process_io_runner_); | 749 return static_cast<bool>(browser_process_io_runner_); |
750 } | 750 } |
751 | 751 |
752 } // namespace content | 752 } // namespace content |
OLD | NEW |