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

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

Issue 598483002: Fix WeakPtrFactory member ordering in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed order of friend class Created 6 years, 2 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
« no previous file with comments | « content/browser/shared_worker/shared_worker_host.cc ('k') | content/child/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')
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 scoped_refptr<ChildHistogramMessageFilter> histogram_message_filter_; 234 scoped_refptr<ChildHistogramMessageFilter> histogram_message_filter_;
235 235
236 scoped_refptr<ChildResourceMessageFilter> resource_message_filter_; 236 scoped_refptr<ChildResourceMessageFilter> resource_message_filter_;
237 237
238 scoped_refptr<ServiceWorkerMessageFilter> service_worker_message_filter_; 238 scoped_refptr<ServiceWorkerMessageFilter> service_worker_message_filter_;
239 239
240 scoped_refptr<QuotaMessageFilter> quota_message_filter_; 240 scoped_refptr<QuotaMessageFilter> quota_message_filter_;
241 241
242 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_; 242 scoped_ptr<ChildSharedBitmapManager> shared_bitmap_manager_;
243 243
244 base::WeakPtrFactory<ChildThread> channel_connected_factory_;
245
246 // Observes the trace event system. When tracing is enabled, optionally 244 // Observes the trace event system. When tracing is enabled, optionally
247 // starts profiling the tcmalloc heap. 245 // starts profiling the tcmalloc heap.
248 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_; 246 scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
249 247
250 scoped_ptr<base::PowerMonitor> power_monitor_; 248 scoped_ptr<base::PowerMonitor> power_monitor_;
251 249
252 bool in_browser_process_; 250 bool in_browser_process_;
253 251
252 base::WeakPtrFactory<ChildThread> channel_connected_factory_;
253
254 DISALLOW_COPY_AND_ASSIGN(ChildThread); 254 DISALLOW_COPY_AND_ASSIGN(ChildThread);
255 }; 255 };
256 256
257 } // namespace content 257 } // namespace content
258 258
259 #endif // CONTENT_CHILD_CHILD_THREAD_H_ 259 #endif // CONTENT_CHILD_CHILD_THREAD_H_
OLDNEW
« no previous file with comments | « content/browser/shared_worker/shared_worker_host.cc ('k') | content/child/child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698