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

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

Issue 179923006: Attempting to resolve a race condition with PowerMonitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored to a more explicitly singleton-like style. Created 6 years, 9 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
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"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 scoped_refptr<ServiceWorkerMessageFilter> service_worker_message_filter_; 218 scoped_refptr<ServiceWorkerMessageFilter> service_worker_message_filter_;
219 219
220 scoped_refptr<QuotaMessageFilter> quota_message_filter_; 220 scoped_refptr<QuotaMessageFilter> quota_message_filter_;
221 221
222 base::WeakPtrFactory<ChildThread> channel_connected_factory_; 222 base::WeakPtrFactory<ChildThread> channel_connected_factory_;
223 223
224 // Observes the trace event system. When tracing is enabled, optionally 224 // Observes the trace event system. When tracing is enabled, optionally
225 // starts profiling the tcmalloc heap. 225 // starts profiling the tcmalloc heap.
226 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_; 226 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
227 227
228 scoped_ptr<base::PowerMonitor> power_monitor_;
229
230 bool in_browser_process_; 228 bool in_browser_process_;
231 229
232 DISALLOW_COPY_AND_ASSIGN(ChildThread); 230 DISALLOW_COPY_AND_ASSIGN(ChildThread);
233 }; 231 };
234 232
235 } // namespace content 233 } // namespace content
236 234
237 #endif // CONTENT_CHILD_CHILD_THREAD_H_ 235 #endif // CONTENT_CHILD_CHILD_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698