diff options
author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/crash_handler_host_linux.h | |
parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/crash_handler_host_linux.h')
-rw-r--r-- | chrome/browser/crash_handler_host_linux.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/crash_handler_host_linux.h b/chrome/browser/crash_handler_host_linux.h index 0e7bf6e..bc2214b 100644 --- a/chrome/browser/crash_handler_host_linux.h +++ b/chrome/browser/crash_handler_host_linux.h @@ -42,6 +42,11 @@ class CrashHandlerHostLinux : public MessageLoopForIO::Watcher, // MessageLoop::DestructionObserver impl: virtual void WillDestroyCurrentMessageLoop(); +#if defined(USE_LINUX_BREAKPAD) + // Whether we are shutting down or not. + bool IsShuttingDown() const; +#endif + protected: CrashHandlerHostLinux(); virtual ~CrashHandlerHostLinux(); @@ -67,6 +72,7 @@ class CrashHandlerHostLinux : public MessageLoopForIO::Watcher, #if defined(USE_LINUX_BREAKPAD) MessageLoopForIO::FileDescriptorWatcher file_descriptor_watcher_; scoped_ptr<base::Thread> uploader_thread_; + bool shutting_down_; #endif DISALLOW_COPY_AND_ASSIGN(CrashHandlerHostLinux); |