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

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

Issue 2069803003: Fold //ipc/mojo into //ipc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-deps
Patch Set: Try fix mac tests. Created 4 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
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/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
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 "ipc/mojo/scoped_ipc_support.h" 68 #include "ipc/mojo/scoped_ipc_support.h"
69 #include "mojo/edk/embedder/embedder.h" 69 #include "mojo/edk/embedder/embedder.h"
70 #include "mojo/edk/embedder/named_platform_channel_pair.h" 70 #include "mojo/edk/embedder/named_platform_channel_pair.h"
71 #include "mojo/edk/embedder/platform_channel_pair.h" 71 #include "mojo/edk/embedder/platform_channel_pair.h"
72 72
73 #if defined(OS_POSIX) 73 #if defined(OS_POSIX)
74 #include "base/posix/global_descriptors.h" 74 #include "base/posix/global_descriptors.h"
75 #include "content/public/common/content_descriptors.h" 75 #include "content/public/common/content_descriptors.h"
76 #endif 76 #endif
77 77
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 void ChildThreadImpl::EnsureConnected() { 741 void ChildThreadImpl::EnsureConnected() {
742 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; 742 VLOG(0) << "ChildThreadImpl::EnsureConnected()";
743 base::Process::Current().Terminate(0, false); 743 base::Process::Current().Terminate(0, false);
744 } 744 }
745 745
746 bool ChildThreadImpl::IsInBrowserProcess() const { 746 bool ChildThreadImpl::IsInBrowserProcess() const {
747 return static_cast<bool>(browser_process_io_runner_); 747 return static_cast<bool>(browser_process_io_runner_);
748 } 748 }
749 749
750 } // namespace content 750 } // namespace content
OLDNEW
« no previous file with comments | « content/child/BUILD.gn ('k') | content/common/BUILD.gn » ('j') | ipc/mojo/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698