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

Side by Side Diff: content/gpu/gpu_watchdog_thread.h

Issue 565013003: Changing the order of initialization WeakPtrFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving the build error Created 6 years, 3 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 | « no previous file | content/gpu/gpu_watchdog_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_GPU_GPU_WATCHDOG_THREAD_H_ 5 #ifndef CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
6 #define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ 6 #define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 #if defined(OS_WIN) 82 #if defined(OS_WIN)
83 void* watched_thread_handle_; 83 void* watched_thread_handle_;
84 base::TimeDelta arm_cpu_time_; 84 base::TimeDelta arm_cpu_time_;
85 #endif 85 #endif
86 86
87 // Time after which it's assumed that the computer has been suspended since 87 // Time after which it's assumed that the computer has been suspended since
88 // the task was posted. 88 // the task was posted.
89 base::Time suspension_timeout_; 89 base::Time suspension_timeout_;
90 90
91 base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;
92
93 bool suspended_; 91 bool suspended_;
94 92
95 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
96 FILE* tty_file_; 94 FILE* tty_file_;
97 #endif 95 #endif
98 96
97 base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;
98
99 DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread); 99 DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);
100 }; 100 };
101 101
102 } // namespace content 102 } // namespace content
103 103
104 #endif // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ 104 #endif // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | content/gpu/gpu_watchdog_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698