OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/common/child_thread.h" | 5 #include "content/common/child_thread.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "content/common/child_process.h" | 10 #include "content/common/child_process.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 #endif | 52 #endif |
53 | 53 |
54 resource_dispatcher_.reset(new ResourceDispatcher(this)); | 54 resource_dispatcher_.reset(new ResourceDispatcher(this)); |
55 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); | 55 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); |
56 file_system_dispatcher_.reset(new FileSystemDispatcher()); | 56 file_system_dispatcher_.reset(new FileSystemDispatcher()); |
57 quota_dispatcher_.reset(new QuotaDispatcher()); | 57 quota_dispatcher_.reset(new QuotaDispatcher()); |
58 | 58 |
59 sync_message_filter_ = | 59 sync_message_filter_ = |
60 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); | 60 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); |
61 channel_->AddFilter(sync_message_filter_.get()); | 61 channel_->AddFilter(sync_message_filter_.get()); |
62 | |
63 #if !defined(NACL_WIN64) | |
64 // This brings in a depenency on gpu, which isn't linked in with NaCl's win64 | |
65 // build. | |
66 channel_->AddFilter(new ChildTraceMessageFilter()); | 62 channel_->AddFilter(new ChildTraceMessageFilter()); |
67 #endif | |
68 | 63 |
69 // When running in unit tests, there is already a NotificationService object. | 64 // When running in unit tests, there is already a NotificationService object. |
70 // Since only one can exist at a time per thread, check first. | 65 // Since only one can exist at a time per thread, check first. |
71 if (!NotificationService::current()) | 66 if (!NotificationService::current()) |
72 notification_service_.reset(new NotificationService); | 67 notification_service_.reset(new NotificationService); |
73 } | 68 } |
74 | 69 |
75 ChildThread::~ChildThread() { | 70 ChildThread::~ChildThread() { |
76 #ifdef IPC_MESSAGE_LOG_ENABLED | 71 #ifdef IPC_MESSAGE_LOG_ENABLED |
77 IPC::Logging::GetInstance()->SetIPCSender(NULL); | 72 IPC::Logging::GetInstance()->SetIPCSender(NULL); |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 MessageLoop::current()->Quit(); | 200 MessageLoop::current()->Quit(); |
206 return; | 201 return; |
207 } | 202 } |
208 | 203 |
209 // The child process shutdown sequence is a request response based mechanism, | 204 // The child process shutdown sequence is a request response based mechanism, |
210 // where we send out an initial feeler request to the child process host | 205 // where we send out an initial feeler request to the child process host |
211 // instance in the browser to verify if it's ok to shutdown the child process. | 206 // instance in the browser to verify if it's ok to shutdown the child process. |
212 // The browser then sends back a response if it's ok to shutdown. | 207 // The browser then sends back a response if it's ok to shutdown. |
213 Send(new ChildProcessHostMsg_ShutdownRequest); | 208 Send(new ChildProcessHostMsg_ShutdownRequest); |
214 } | 209 } |
OLD | NEW |