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

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

Issue 9348028: Revert 120789 - Propogate status setting for profiler to track parents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « content/common/child_process_messages.h ('k') | content/common/child_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_COMMON_CHILD_THREAD_H_ 5 #ifndef CONTENT_COMMON_CHILD_THREAD_H_
6 #define CONTENT_COMMON_CHILD_THREAD_H_ 6 #define CONTENT_COMMON_CHILD_THREAD_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/shared_memory.h" 11 #include "base/shared_memory.h"
12 #include "base/tracked_objects.h"
13 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
14 #include "content/common/message_router.h" 13 #include "content/common/message_router.h"
15 #include "webkit/glue/resource_loader_bridge.h" 14 #include "webkit/glue/resource_loader_bridge.h"
16 15
17 class FileSystemDispatcher; 16 class FileSystemDispatcher;
18 class MessageLoop; 17 class MessageLoop;
19 class QuotaDispatcher; 18 class QuotaDispatcher;
20 class ResourceDispatcher; 19 class ResourceDispatcher;
21 class SocketStreamDispatcher; 20 class SocketStreamDispatcher;
22 21
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // Called when the process refcount is 0. 85 // Called when the process refcount is 0.
87 void OnProcessFinalRelease(); 86 void OnProcessFinalRelease();
88 87
89 virtual bool OnControlMessageReceived(const IPC::Message& msg); 88 virtual bool OnControlMessageReceived(const IPC::Message& msg);
90 virtual void OnShutdown(); 89 virtual void OnShutdown();
91 90
92 #ifdef IPC_MESSAGE_LOG_ENABLED 91 #ifdef IPC_MESSAGE_LOG_ENABLED
93 virtual void OnSetIPCLoggingEnabled(bool enable); 92 virtual void OnSetIPCLoggingEnabled(bool enable);
94 #endif 93 #endif
95 94
96 virtual void OnSetProfilerStatus(tracked_objects::ThreadData::Status status); 95 virtual void OnSetProfilerStatus(bool enable);
97 virtual void OnGetChildProfilerData(int sequence_number, 96 virtual void OnGetChildProfilerData(int sequence_number,
98 const std::string& process_type); 97 const std::string& process_type);
99 98
100 virtual void OnDumpHandles(); 99 virtual void OnDumpHandles();
101 100
102 void set_on_channel_error_called(bool on_channel_error_called) { 101 void set_on_channel_error_called(bool on_channel_error_called) {
103 on_channel_error_called_ = on_channel_error_called; 102 on_channel_error_called_ = on_channel_error_called;
104 } 103 }
105 104
106 private: 105 private:
(...skipping 25 matching lines...) Expand all
132 MessageLoop* message_loop_; 131 MessageLoop* message_loop_;
133 132
134 scoped_ptr<FileSystemDispatcher> file_system_dispatcher_; 133 scoped_ptr<FileSystemDispatcher> file_system_dispatcher_;
135 134
136 scoped_ptr<QuotaDispatcher> quota_dispatcher_; 135 scoped_ptr<QuotaDispatcher> quota_dispatcher_;
137 136
138 DISALLOW_COPY_AND_ASSIGN(ChildThread); 137 DISALLOW_COPY_AND_ASSIGN(ChildThread);
139 }; 138 };
140 139
141 #endif // CONTENT_COMMON_CHILD_THREAD_H_ 140 #endif // CONTENT_COMMON_CHILD_THREAD_H_
OLDNEW
« no previous file with comments | « content/common/child_process_messages.h ('k') | content/common/child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698