| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/allocator/allocator_extension.h" | 9 #include "base/allocator/allocator_extension.h" |
| 10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "content/child/service_worker/service_worker_message_filter.h" | 31 #include "content/child/service_worker/service_worker_message_filter.h" |
| 32 #include "content/child/socket_stream_dispatcher.h" | 32 #include "content/child/socket_stream_dispatcher.h" |
| 33 #include "content/child/thread_safe_sender.h" | 33 #include "content/child/thread_safe_sender.h" |
| 34 #include "content/child/websocket_dispatcher.h" | 34 #include "content/child/websocket_dispatcher.h" |
| 35 #include "content/common/child_process_messages.h" | 35 #include "content/common/child_process_messages.h" |
| 36 #include "content/public/common/content_switches.h" | 36 #include "content/public/common/content_switches.h" |
| 37 #include "ipc/ipc_logging.h" | 37 #include "ipc/ipc_logging.h" |
| 38 #include "ipc/ipc_switches.h" | 38 #include "ipc/ipc_switches.h" |
| 39 #include "ipc/ipc_sync_channel.h" | 39 #include "ipc/ipc_sync_channel.h" |
| 40 #include "ipc/ipc_sync_message_filter.h" | 40 #include "ipc/ipc_sync_message_filter.h" |
| 41 #include "webkit/glue/webkit_glue.h" | |
| 42 | 41 |
| 43 #if defined(OS_WIN) | 42 #if defined(OS_WIN) |
| 44 #include "content/common/handle_enumerator_win.h" | 43 #include "content/common/handle_enumerator_win.h" |
| 45 #endif | 44 #endif |
| 46 | 45 |
| 47 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 46 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
| 48 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 47 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
| 49 #endif | 48 #endif |
| 50 | 49 |
| 51 using tracked_objects::ThreadData; | 50 using tracked_objects::ThreadData; |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 // inflight that would addref it. | 489 // inflight that would addref it. |
| 491 Send(new ChildProcessHostMsg_ShutdownRequest); | 490 Send(new ChildProcessHostMsg_ShutdownRequest); |
| 492 } | 491 } |
| 493 | 492 |
| 494 void ChildThread::EnsureConnected() { | 493 void ChildThread::EnsureConnected() { |
| 495 LOG(INFO) << "ChildThread::EnsureConnected()"; | 494 LOG(INFO) << "ChildThread::EnsureConnected()"; |
| 496 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); | 495 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); |
| 497 } | 496 } |
| 498 | 497 |
| 499 } // namespace content | 498 } // namespace content |
| OLD | NEW |