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

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

Issue 882673002: Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part1
Patch Set: Changed comments. 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
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_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 // TODO(ssid): remove these aliases after the tracing clients are moved to the
29 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
24 namespace debug { 30 namespace debug {
25 class TraceMemoryController; 31 using ::base::trace_event::TraceMemoryController;
26 } // namespace debug 32 } // namespace debug
27 } // namespace base 33 } // namespace base
28 34
29 namespace IPC { 35 namespace IPC {
30 class MessageFilter; 36 class MessageFilter;
31 class SyncChannel; 37 class SyncChannel;
32 class SyncMessageFilter; 38 class SyncMessageFilter;
33 } // namespace IPC 39 } // namespace IPC
34 40
35 namespace blink { 41 namespace blink {
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 bool in_browser_process_; 299 bool in_browser_process_;
294 300
295 base::WeakPtrFactory<ChildThread> channel_connected_factory_; 301 base::WeakPtrFactory<ChildThread> channel_connected_factory_;
296 302
297 DISALLOW_COPY_AND_ASSIGN(ChildThread); 303 DISALLOW_COPY_AND_ASSIGN(ChildThread);
298 }; 304 };
299 305
300 } // namespace content 306 } // namespace content
301 307
302 #endif // CONTENT_CHILD_CHILD_THREAD_H_ 308 #endif // CONTENT_CHILD_CHILD_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698