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

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

Issue 1632253002: Allocator cleanup: remove CHROME_PROFILER_TIME and rotten tcmalloc deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "ipc/attachment_broker.h" 57 #include "ipc/attachment_broker.h"
58 #include "ipc/attachment_broker_unprivileged.h" 58 #include "ipc/attachment_broker_unprivileged.h"
59 #include "ipc/ipc_logging.h" 59 #include "ipc/ipc_logging.h"
60 #include "ipc/ipc_platform_file.h" 60 #include "ipc/ipc_platform_file.h"
61 #include "ipc/ipc_switches.h" 61 #include "ipc/ipc_switches.h"
62 #include "ipc/ipc_sync_channel.h" 62 #include "ipc/ipc_sync_channel.h"
63 #include "ipc/ipc_sync_message_filter.h" 63 #include "ipc/ipc_sync_message_filter.h"
64 #include "ipc/mojo/ipc_channel_mojo.h" 64 #include "ipc/mojo/ipc_channel_mojo.h"
65 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 65 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
66 66
67 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
68 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
69 #endif
70
71 #if defined(USE_OZONE) 67 #if defined(USE_OZONE)
72 #include "ui/ozone/public/client_native_pixmap_factory.h" 68 #include "ui/ozone/public/client_native_pixmap_factory.h"
73 #endif 69 #endif
74 70
75 #if defined(MOJO_SHELL_CLIENT) 71 #if defined(MOJO_SHELL_CLIENT)
76 #include "content/common/mojo/mojo_shell_connection_impl.h" 72 #include "content/common/mojo/mojo_shell_connection_impl.h"
77 #endif 73 #endif
78 74
79 using tracked_objects::ThreadData; 75 using tracked_objects::ThreadData;
80 76
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 void ChildThreadImpl::EnsureConnected() { 727 void ChildThreadImpl::EnsureConnected() {
732 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; 728 VLOG(0) << "ChildThreadImpl::EnsureConnected()";
733 base::Process::Current().Terminate(0, false); 729 base::Process::Current().Terminate(0, false);
734 } 730 }
735 731
736 bool ChildThreadImpl::IsInBrowserProcess() const { 732 bool ChildThreadImpl::IsInBrowserProcess() const {
737 return browser_process_io_runner_; 733 return browser_process_io_runner_;
738 } 734 }
739 735
740 } // namespace content 736 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698