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

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

Issue 1468883003: Remove memory category from chrome://tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@format-trace-event
Patch Set: Rebase Created 5 years 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
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/child/child_thread_impl.cc » ('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 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 5 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/shared_memory.h" 12 #include "base/memory/shared_memory.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/power_monitor/power_monitor.h" 14 #include "base/power_monitor/power_monitor.h"
15 #include "base/sequenced_task_runner.h" 15 #include "base/sequenced_task_runner.h"
16 #include "base/tracked_objects.h" 16 #include "base/tracked_objects.h"
17 #include "content/child/mojo/mojo_application.h" 17 #include "content/child/mojo/mojo_application.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/common/message_router.h" 19 #include "content/common/message_router.h"
20 #include "content/common/mojo/channel_init.h" 20 #include "content/common/mojo/channel_init.h"
21 #include "content/public/child/child_thread.h" 21 #include "content/public/child/child_thread.h"
22 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. 22 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
23 #include "ipc/ipc_platform_file.h" 23 #include "ipc/ipc_platform_file.h"
24 24
25 namespace base { 25 namespace base {
26 class MessageLoop; 26 class MessageLoop;
27
28 namespace trace_event {
29 class TraceMemoryController;
30 } // namespace trace_event
31 } // namespace base 27 } // namespace base
32 28
33 namespace IPC { 29 namespace IPC {
34 class AttachmentBrokerUnprivileged; 30 class AttachmentBrokerUnprivileged;
35 class MessageFilter; 31 class MessageFilter;
36 class ScopedIPCSupport; 32 class ScopedIPCSupport;
37 class SyncChannel; 33 class SyncChannel;
38 class SyncMessageFilter; 34 class SyncMessageFilter;
39 } // namespace IPC 35 } // namespace IPC
40 36
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 279
284 scoped_refptr<PushDispatcher> push_dispatcher_; 280 scoped_refptr<PushDispatcher> push_dispatcher_;
285 281
286 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_; 282 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_;
287 283
288 scoped_ptr<ChildGpuMemoryBufferManager> gpu_memory_buffer_manager_; 284 scoped_ptr<ChildGpuMemoryBufferManager> gpu_memory_buffer_manager_;
289 285
290 scoped_ptr<ChildDiscardableSharedMemoryManager> 286 scoped_ptr<ChildDiscardableSharedMemoryManager>
291 discardable_shared_memory_manager_; 287 discardable_shared_memory_manager_;
292 288
293 // Observes the trace event system. When tracing is enabled, optionally
294 // starts profiling the tcmalloc heap.
295 scoped_ptr<base::trace_event::TraceMemoryController> trace_memory_controller_;
296
297 scoped_ptr<base::PowerMonitor> power_monitor_; 289 scoped_ptr<base::PowerMonitor> power_monitor_;
298 290
299 scoped_refptr<ChildMessageFilter> geofencing_message_filter_; 291 scoped_refptr<ChildMessageFilter> geofencing_message_filter_;
300 292
301 scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner_; 293 scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner_;
302 294
303 ChannelInit mojo_shell_channel_init_; 295 ChannelInit mojo_shell_channel_init_;
304 296
305 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_; 297 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_;
306 298
(...skipping 27 matching lines...) Expand all
334 326
335 private: 327 private:
336 struct Options options_; 328 struct Options options_;
337 329
338 DISALLOW_COPY_AND_ASSIGN(Builder); 330 DISALLOW_COPY_AND_ASSIGN(Builder);
339 }; 331 };
340 332
341 } // namespace content 333 } // namespace content
342 334
343 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 335 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698