| 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.h" | 5 #include "content/child/child_thread.h" |
| 6 | 6 |
| 7 #include "base/allocator/allocator_extension.h" | 7 #include "base/allocator/allocator_extension.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/process.h" | 10 #include "base/process.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 IPC::Logging::GetInstance()->SetIPCSender(this); | 109 IPC::Logging::GetInstance()->SetIPCSender(this); |
| 110 #endif | 110 #endif |
| 111 | 111 |
| 112 resource_dispatcher_.reset(new ResourceDispatcher(this)); | 112 resource_dispatcher_.reset(new ResourceDispatcher(this)); |
| 113 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); | 113 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); |
| 114 file_system_dispatcher_.reset(new FileSystemDispatcher()); | 114 file_system_dispatcher_.reset(new FileSystemDispatcher()); |
| 115 quota_dispatcher_.reset(new QuotaDispatcher()); | 115 quota_dispatcher_.reset(new QuotaDispatcher()); |
| 116 | 116 |
| 117 sync_message_filter_ = | 117 sync_message_filter_ = |
| 118 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); | 118 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); |
| 119 thread_safe_sender_ = new ThreadSafeSender(base::MessageLoopProxy::current(), | 119 thread_safe_sender_ = new ThreadSafeSender( |
| 120 sync_message_filter_.get()); | 120 base::MessageLoopProxy::current().get(), sync_message_filter_.get()); |
| 121 histogram_message_filter_ = new ChildHistogramMessageFilter(); | 121 histogram_message_filter_ = new ChildHistogramMessageFilter(); |
| 122 resource_message_filter_ = | 122 resource_message_filter_ = |
| 123 new ChildResourceMessageFilter(resource_dispatcher()); | 123 new ChildResourceMessageFilter(resource_dispatcher()); |
| 124 | 124 |
| 125 channel_->AddFilter(histogram_message_filter_.get()); | 125 channel_->AddFilter(histogram_message_filter_.get()); |
| 126 channel_->AddFilter(sync_message_filter_.get()); | 126 channel_->AddFilter(sync_message_filter_.get()); |
| 127 channel_->AddFilter(new tracing::ChildTraceMessageFilter( | 127 channel_->AddFilter(new tracing::ChildTraceMessageFilter( |
| 128 ChildProcess::current()->io_message_loop_proxy())); | 128 ChildProcess::current()->io_message_loop_proxy())); |
| 129 channel_->AddFilter(resource_message_filter_.get()); | 129 channel_->AddFilter(resource_message_filter_.get()); |
| 130 | 130 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 // inflight that would addref it. | 351 // inflight that would addref it. |
| 352 Send(new ChildProcessHostMsg_ShutdownRequest); | 352 Send(new ChildProcessHostMsg_ShutdownRequest); |
| 353 } | 353 } |
| 354 | 354 |
| 355 void ChildThread::EnsureConnected() { | 355 void ChildThread::EnsureConnected() { |
| 356 LOG(INFO) << "ChildThread::EnsureConnected()"; | 356 LOG(INFO) << "ChildThread::EnsureConnected()"; |
| 357 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); | 357 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); |
| 358 } | 358 } |
| 359 | 359 |
| 360 } // namespace content | 360 } // namespace content |
| OLD | NEW |