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

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

Issue 226263008: Revert of Attempting to resolve a race condition with PowerMonitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 scoped_refptr<QuotaMessageFilter> quota_message_filter_; 237 scoped_refptr<QuotaMessageFilter> quota_message_filter_;
238 238
239 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_; 239 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_;
240 240
241 base::WeakPtrFactory<ChildThread> channel_connected_factory_; 241 base::WeakPtrFactory<ChildThread> channel_connected_factory_;
242 242
243 // Observes the trace event system. When tracing is enabled, optionally 243 // Observes the trace event system. When tracing is enabled, optionally
244 // starts profiling the tcmalloc heap. 244 // starts profiling the tcmalloc heap.
245 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_; 245 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
246 246
247 scoped_ptr<base::PowerMonitor> power_monitor_;
248
247 bool in_browser_process_; 249 bool in_browser_process_;
248 250
249 DISALLOW_COPY_AND_ASSIGN(ChildThread); 251 DISALLOW_COPY_AND_ASSIGN(ChildThread);
250 }; 252 };
251 253
252 } // namespace content 254 } // namespace content
253 255
254 #endif // CONTENT_CHILD_CHILD_THREAD_H_ 256 #endif // CONTENT_CHILD_CHILD_THREAD_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/child/child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698