Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: content/child/child_thread.cc

Issue 16328003: Move a bunch of child-only code from content/common to content/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/child/child_thread.h ('k') | content/child/database_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/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"
11 #include "base/process_util.h" 11 #include "base/process_util.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/tracked_objects.h" 13 #include "base/tracked_objects.h"
14 #include "components/tracing/child_trace_message_filter.h" 14 #include "components/tracing/child_trace_message_filter.h"
15 #include "content/common/child_histogram_message_filter.h" 15 #include "content/child/child_histogram_message_filter.h"
16 #include "content/common/child_process.h" 16 #include "content/child/child_process.h"
17 #include "content/child/child_resource_message_filter.h"
18 #include "content/child/fileapi/file_system_dispatcher.h"
19 #include "content/child/quota_dispatcher.h"
20 #include "content/child/resource_dispatcher.h"
21 #include "content/child/socket_stream_dispatcher.h"
22 #include "content/child/thread_safe_sender.h"
17 #include "content/common/child_process_messages.h" 23 #include "content/common/child_process_messages.h"
18 #include "content/common/child_resource_message_filter.h"
19 #include "content/common/fileapi/file_system_dispatcher.h"
20 #include "content/common/quota_dispatcher.h"
21 #include "content/common/resource_dispatcher.h"
22 #include "content/common/socket_stream_dispatcher.h"
23 #include "content/common/thread_safe_sender.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "ipc/ipc_logging.h" 25 #include "ipc/ipc_logging.h"
26 #include "ipc/ipc_switches.h" 26 #include "ipc/ipc_switches.h"
27 #include "ipc/ipc_sync_channel.h" 27 #include "ipc/ipc_sync_channel.h"
28 #include "ipc/ipc_sync_message_filter.h" 28 #include "ipc/ipc_sync_message_filter.h"
29 #include "webkit/glue/webkit_glue.h" 29 #include "webkit/glue/webkit_glue.h"
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include "content/common/handle_enumerator_win.h" 32 #include "content/common/handle_enumerator_win.h"
33 #endif 33 #endif
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « content/child/child_thread.h ('k') | content/child/database_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698