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_platform_file.h" | 59 #include "ipc/ipc_platform_file.h" |
60 #include "ipc/ipc_sync_channel.h" | 60 #include "ipc/ipc_sync_channel.h" |
61 #include "ipc/ipc_sync_message_filter.h" | 61 #include "ipc/ipc_sync_message_filter.h" |
62 #include "mojo/edk/embedder/embedder.h" | 62 #include "mojo/edk/embedder/embedder.h" |
63 #include "mojo/edk/embedder/named_platform_channel_pair.h" | 63 #include "mojo/edk/embedder/named_platform_channel_pair.h" |
64 #include "mojo/edk/embedder/platform_channel_pair.h" | 64 #include "mojo/edk/embedder/platform_channel_pair.h" |
65 #include "mojo/edk/embedder/scoped_ipc_support.h" | 65 #include "mojo/edk/embedder/scoped_ipc_support.h" |
66 #include "mojo/public/cpp/system/buffer.h" | 66 #include "mojo/public/cpp/system/buffer.h" |
67 #include "mojo/public/cpp/system/platform_handle.h" | 67 #include "mojo/public/cpp/system/platform_handle.h" |
68 #include "services/device/public/cpp/power_monitor/power_monitor_broadcast_sourc
e.h" | 68 #include "services/device/public/cpp/power_monitor/power_monitor_broadcast_sourc
e.h" |
69 #include "services/resource_coordinator/public/cpp/memory/memory_dump_manager_de
legate_impl.h" | 69 #include "services/resource_coordinator/public/cpp/memory/process_local_dump_man
ager_impl.h" |
70 #include "services/service_manager/public/cpp/connector.h" | 70 #include "services/service_manager/public/cpp/connector.h" |
71 #include "services/service_manager/public/cpp/interface_factory.h" | 71 #include "services/service_manager/public/cpp/interface_factory.h" |
72 #include "services/service_manager/public/cpp/interface_provider.h" | 72 #include "services/service_manager/public/cpp/interface_provider.h" |
73 #include "services/service_manager/public/cpp/interface_registry.h" | 73 #include "services/service_manager/public/cpp/interface_registry.h" |
74 #include "services/service_manager/runner/common/client_util.h" | 74 #include "services/service_manager/runner/common/client_util.h" |
75 | 75 |
76 #if defined(OS_POSIX) | 76 #if defined(OS_POSIX) |
77 #include "base/posix/global_descriptors.h" | 77 #include "base/posix/global_descriptors.h" |
78 #include "content/public/common/content_descriptors.h" | 78 #include "content/public/common/content_descriptors.h" |
79 #endif | 79 #endif |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 channel_->AddFilter(service_worker_message_filter_->GetFilter()); | 489 channel_->AddFilter(service_worker_message_filter_->GetFilter()); |
490 | 490 |
491 if (!IsInBrowserProcess()) { | 491 if (!IsInBrowserProcess()) { |
492 // In single process mode, browser-side tracing and memory will cover the | 492 // In single process mode, browser-side tracing and memory will cover the |
493 // whole process including renderers. | 493 // whole process including renderers. |
494 channel_->AddFilter(new tracing::ChildTraceMessageFilter( | 494 channel_->AddFilter(new tracing::ChildTraceMessageFilter( |
495 ChildProcess::current()->io_task_runner())); | 495 ChildProcess::current()->io_task_runner())); |
496 channel_->AddFilter(new ChildMemoryMessageFilter()); | 496 channel_->AddFilter(new ChildMemoryMessageFilter()); |
497 | 497 |
498 if (service_manager_connection_) { | 498 if (service_manager_connection_) { |
499 memory_instrumentation::MemoryDumpManagerDelegateImpl::Config config( | 499 memory_instrumentation::ProcessLocalDumpManagerImpl::Config config( |
500 GetConnector(), mojom::kBrowserServiceName); | 500 GetConnector(), mojom::kBrowserServiceName); |
501 auto delegate = base::MakeUnique< | 501 memory_instrumentation::ProcessLocalDumpManagerImpl::CreateInstance( |
502 memory_instrumentation::MemoryDumpManagerDelegateImpl>(config); | 502 config); |
503 base::trace_event::MemoryDumpManager::GetInstance()->Initialize( | |
504 std::move(delegate)); | |
505 } | 503 } |
506 } | 504 } |
507 | 505 |
508 // In single process mode we may already have a power monitor, | 506 // In single process mode we may already have a power monitor, |
509 // also for some edge cases where there is no ServiceManagerConnection, we do | 507 // also for some edge cases where there is no ServiceManagerConnection, we do |
510 // not create the power monitor. | 508 // not create the power monitor. |
511 if (!base::PowerMonitor::Get() && service_manager_connection_) { | 509 if (!base::PowerMonitor::Get() && service_manager_connection_) { |
512 auto power_monitor_source = | 510 auto power_monitor_source = |
513 base::MakeUnique<device::PowerMonitorBroadcastSource>(GetConnector()); | 511 base::MakeUnique<device::PowerMonitorBroadcastSource>(GetConnector()); |
514 power_monitor_.reset( | 512 power_monitor_.reset( |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 connected_to_browser_ = true; | 868 connected_to_browser_ = true; |
871 child_info_ = local_info; | 869 child_info_ = local_info; |
872 browser_info_ = remote_info; | 870 browser_info_ = remote_info; |
873 } | 871 } |
874 | 872 |
875 bool ChildThreadImpl::IsInBrowserProcess() const { | 873 bool ChildThreadImpl::IsInBrowserProcess() const { |
876 return static_cast<bool>(browser_process_io_runner_); | 874 return static_cast<bool>(browser_process_io_runner_); |
877 } | 875 } |
878 | 876 |
879 } // namespace content | 877 } // namespace content |
OLD | NEW |