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

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

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 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
« no previous file with comments | « content/child/blink_platform_impl.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/tracked_objects.h" 15 #include "base/tracked_objects.h"
16 #include "content/child/mojo/mojo_application.h" 16 #include "content/child/mojo/mojo_application.h"
17 #include "content/common/content_export.h" 17 #include "content/common/content_export.h"
18 #include "content/common/message_router.h" 18 #include "content/common/message_router.h"
19 #include "content/public/child/child_thread.h" 19 #include "content/public/child/child_thread.h"
20 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. 20 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
21 21
22 namespace base { 22 namespace base {
23 class MessageLoop; 23 class MessageLoop;
24 24
25 namespace trace_event { 25 namespace trace_event {
26 class TraceMemoryController; 26 class TraceMemoryController;
27 } // namespace trace_event 27 } // namespace trace_event
28
29 // TODO(ssid): remove these aliases after the tracing clients are moved to the
30 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
31 namespace debug {
32 using ::base::trace_event::TraceMemoryController;
33 } // namespace debug
34 } // namespace base 28 } // namespace base
35 29
36 namespace IPC { 30 namespace IPC {
37 class MessageFilter; 31 class MessageFilter;
38 class SyncChannel; 32 class SyncChannel;
39 class SyncMessageFilter; 33 class SyncMessageFilter;
40 } // namespace IPC 34 } // namespace IPC
41 35
42 namespace blink { 36 namespace blink {
43 class WebFrame; 37 class WebFrame;
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 282
289 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_; 283 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_;
290 284
291 scoped_ptr<ChildGpuMemoryBufferManager> gpu_memory_buffer_manager_; 285 scoped_ptr<ChildGpuMemoryBufferManager> gpu_memory_buffer_manager_;
292 286
293 scoped_ptr<ChildDiscardableSharedMemoryManager> 287 scoped_ptr<ChildDiscardableSharedMemoryManager>
294 discardable_shared_memory_manager_; 288 discardable_shared_memory_manager_;
295 289
296 // Observes the trace event system. When tracing is enabled, optionally 290 // Observes the trace event system. When tracing is enabled, optionally
297 // starts profiling the tcmalloc heap. 291 // starts profiling the tcmalloc heap.
298 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_; 292 scoped_ptr<base::trace_event::TraceMemoryController> trace_memory_controller_;
299 293
300 scoped_ptr<base::PowerMonitor> power_monitor_; 294 scoped_ptr<base::PowerMonitor> power_monitor_;
301 295
302 scoped_refptr<ChildMessageFilter> geofencing_message_filter_; 296 scoped_refptr<ChildMessageFilter> geofencing_message_filter_;
303 scoped_refptr<ChildMessageFilter> bluetooth_message_filter_; 297 scoped_refptr<ChildMessageFilter> bluetooth_message_filter_;
304 298
305 scoped_refptr<NavigatorConnectDispatcher> navigator_connect_dispatcher_; 299 scoped_refptr<NavigatorConnectDispatcher> navigator_connect_dispatcher_;
306 300
307 bool in_browser_process_; 301 bool in_browser_process_;
308 302
309 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_; 303 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_;
310 304
311 DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl); 305 DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl);
312 }; 306 };
313 307
314 } // namespace content 308 } // namespace content
315 309
316 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 310 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698