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_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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "ipc/ipc_sync_channel.h" | 59 #include "ipc/ipc_sync_channel.h" |
60 #include "ipc/ipc_sync_message_filter.h" | 60 #include "ipc/ipc_sync_message_filter.h" |
61 #include "mojo/edk/embedder/embedder.h" | 61 #include "mojo/edk/embedder/embedder.h" |
62 #include "mojo/edk/embedder/named_platform_channel_pair.h" | 62 #include "mojo/edk/embedder/named_platform_channel_pair.h" |
63 #include "mojo/edk/embedder/platform_channel_pair.h" | 63 #include "mojo/edk/embedder/platform_channel_pair.h" |
64 #include "mojo/edk/embedder/scoped_ipc_support.h" | 64 #include "mojo/edk/embedder/scoped_ipc_support.h" |
65 #include "mojo/public/cpp/system/buffer.h" | 65 #include "mojo/public/cpp/system/buffer.h" |
66 #include "mojo/public/cpp/system/platform_handle.h" | 66 #include "mojo/public/cpp/system/platform_handle.h" |
67 #include "services/device/public/cpp/power_monitor/power_monitor_broadcast_sourc
e.h" | 67 #include "services/device/public/cpp/power_monitor/power_monitor_broadcast_sourc
e.h" |
68 #include "services/device/public/interfaces/constants.mojom.h" | 68 #include "services/device/public/interfaces/constants.mojom.h" |
| 69 #include "services/resource_coordinator/public/cpp/memory/memory_dump_manager_de
legate_impl.h" |
69 #include "services/service_manager/public/cpp/connector.h" | 70 #include "services/service_manager/public/cpp/connector.h" |
70 #include "services/service_manager/public/cpp/interface_factory.h" | 71 #include "services/service_manager/public/cpp/interface_factory.h" |
71 #include "services/service_manager/public/cpp/interface_provider.h" | 72 #include "services/service_manager/public/cpp/interface_provider.h" |
72 #include "services/service_manager/public/cpp/interface_registry.h" | 73 #include "services/service_manager/public/cpp/interface_registry.h" |
73 #include "services/service_manager/runner/common/client_util.h" | 74 #include "services/service_manager/runner/common/client_util.h" |
74 | 75 |
75 #if defined(OS_POSIX) | 76 #if defined(OS_POSIX) |
76 #include "base/posix/global_descriptors.h" | 77 #include "base/posix/global_descriptors.h" |
77 #include "content/public/common/content_descriptors.h" | 78 #include "content/public/common/content_descriptors.h" |
78 #endif | 79 #endif |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 channel_->AddFilter(quota_message_filter_->GetFilter()); | 497 channel_->AddFilter(quota_message_filter_->GetFilter()); |
497 channel_->AddFilter(notification_dispatcher_->GetFilter()); | 498 channel_->AddFilter(notification_dispatcher_->GetFilter()); |
498 channel_->AddFilter(service_worker_message_filter_->GetFilter()); | 499 channel_->AddFilter(service_worker_message_filter_->GetFilter()); |
499 | 500 |
500 if (!IsInBrowserProcess()) { | 501 if (!IsInBrowserProcess()) { |
501 // In single process mode, browser-side tracing and memory will cover the | 502 // In single process mode, browser-side tracing and memory will cover the |
502 // whole process including renderers. | 503 // whole process including renderers. |
503 channel_->AddFilter(new tracing::ChildTraceMessageFilter( | 504 channel_->AddFilter(new tracing::ChildTraceMessageFilter( |
504 ChildProcess::current()->io_task_runner())); | 505 ChildProcess::current()->io_task_runner())); |
505 channel_->AddFilter(new ChildMemoryMessageFilter()); | 506 channel_->AddFilter(new ChildMemoryMessageFilter()); |
| 507 |
| 508 memory_instrumentation::MemoryDumpManagerDelegateImpl::Config config( |
| 509 GetRemoteInterfaces()); |
| 510 memory_instrumentation::MemoryDumpManagerDelegateImpl::Create(config); |
506 } | 511 } |
507 | 512 |
508 // In single process mode we may already have a power monitor, | 513 // In single process mode we may already have a power monitor, |
509 // also for some edge cases where there is no ServiceManagerConnection, we do | 514 // also for some edge cases where there is no ServiceManagerConnection, we do |
510 // not create the power monitor. | 515 // not create the power monitor. |
511 if (!base::PowerMonitor::Get() && service_manager_connection_) { | 516 if (!base::PowerMonitor::Get() && service_manager_connection_) { |
512 std::unique_ptr<service_manager::Connection> device_connection = | 517 std::unique_ptr<service_manager::Connection> device_connection = |
513 service_manager_connection_->GetConnector()->Connect( | 518 service_manager_connection_->GetConnector()->Connect( |
514 device::mojom::kServiceName); | 519 device::mojom::kServiceName); |
515 auto power_monitor_source = | 520 auto power_monitor_source = |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 connected_to_browser_ = true; | 877 connected_to_browser_ = true; |
873 child_info_ = local_info; | 878 child_info_ = local_info; |
874 browser_info_ = remote_info; | 879 browser_info_ = remote_info; |
875 } | 880 } |
876 | 881 |
877 bool ChildThreadImpl::IsInBrowserProcess() const { | 882 bool ChildThreadImpl::IsInBrowserProcess() const { |
878 return static_cast<bool>(browser_process_io_runner_); | 883 return static_cast<bool>(browser_process_io_runner_); |
879 } | 884 } |
880 | 885 |
881 } // namespace content | 886 } // namespace content |
OLD | NEW |