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 #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 { |
| 26 class TraceMemoryController; |
| 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 |
25 namespace debug { | 31 namespace debug { |
26 class TraceMemoryController; | 32 using ::base::trace_event::TraceMemoryController; |
27 } // namespace debug | 33 } // namespace debug |
28 } // namespace base | 34 } // namespace base |
29 | 35 |
30 namespace IPC { | 36 namespace IPC { |
31 class MessageFilter; | 37 class MessageFilter; |
32 class SyncChannel; | 38 class SyncChannel; |
33 class SyncMessageFilter; | 39 class SyncMessageFilter; |
34 } // namespace IPC | 40 } // namespace IPC |
35 | 41 |
36 namespace blink { | 42 namespace blink { |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 bool in_browser_process_; | 307 bool in_browser_process_; |
302 | 308 |
303 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_; | 309 base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_; |
304 | 310 |
305 DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl); | 311 DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl); |
306 }; | 312 }; |
307 | 313 |
308 } // namespace content | 314 } // namespace content |
309 | 315 |
310 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ | 316 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ |
OLD | NEW |