| 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_H_ | 5 #ifndef CONTENT_CHILD_CHILD_THREAD_H_ |
| 6 #define CONTENT_CHILD_CHILD_THREAD_H_ | 6 #define CONTENT_CHILD_CHILD_THREAD_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 "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 19 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
| 20 | 20 |
| 21 namespace base { | 21 namespace base { |
| 22 class MessageLoop; | 22 class MessageLoop; |
| 23 | 23 |
| 24 namespace trace_event { |
| 25 class TraceMemoryController; |
| 26 } // namespace trace_event |
| 27 |
| 28 // This is added temporarily. Once the renaming of namespace usages |
| 29 // accross all folders are done, this will be removed. |
| 30 // TODO(ssid): crrev.com/837303004 |
| 24 namespace debug { | 31 namespace debug { |
| 25 class TraceMemoryController; | 32 using ::base::trace_event::TraceMemoryController; |
| 26 } // namespace debug | 33 } // namespace debug |
| 27 } // namespace base | 34 } // namespace base |
| 28 | 35 |
| 29 namespace IPC { | 36 namespace IPC { |
| 30 class MessageFilter; | 37 class MessageFilter; |
| 31 class SyncChannel; | 38 class SyncChannel; |
| 32 class SyncMessageFilter; | 39 class SyncMessageFilter; |
| 33 } // namespace IPC | 40 } // namespace IPC |
| 34 | 41 |
| 35 namespace blink { | 42 namespace blink { |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 bool in_browser_process_; | 300 bool in_browser_process_; |
| 294 | 301 |
| 295 base::WeakPtrFactory<ChildThread> channel_connected_factory_; | 302 base::WeakPtrFactory<ChildThread> channel_connected_factory_; |
| 296 | 303 |
| 297 DISALLOW_COPY_AND_ASSIGN(ChildThread); | 304 DISALLOW_COPY_AND_ASSIGN(ChildThread); |
| 298 }; | 305 }; |
| 299 | 306 |
| 300 } // namespace content | 307 } // namespace content |
| 301 | 308 |
| 302 #endif // CONTENT_CHILD_CHILD_THREAD_H_ | 309 #endif // CONTENT_CHILD_CHILD_THREAD_H_ |
| OLD | NEW |