Chromium Code Reviews| Index: chrome/browser/crash_handler_host_linux.h |
| =================================================================== |
| --- chrome/browser/crash_handler_host_linux.h (revision 211410) |
| +++ chrome/browser/crash_handler_host_linux.h (working copy) |
| @@ -8,7 +8,6 @@ |
| #include "base/compiler_specific.h" |
| #include "base/message_loop.h" |
| -#if defined(USE_LINUX_BREAKPAD) |
| #include <sys/types.h> |
|
Lei Zhang
2013/07/15 20:55:35
ditto, sort all the #includes
jam
2013/07/15 21:15:28
Done.
|
| #include <string> |
| @@ -20,7 +19,6 @@ |
| namespace base { |
| class Thread; |
| } |
| -#endif // defined(USE_LINUX_BREAKPAD) |
| template <typename T> struct DefaultSingletonTraits; |
| @@ -50,26 +48,21 @@ |
| // MessageLoop::DestructionObserver impl: |
| virtual void WillDestroyCurrentMessageLoop() OVERRIDE; |
| -#if defined(USE_LINUX_BREAKPAD) |
| // Whether we are shutting down or not. |
| bool IsShuttingDown() const; |
| -#endif |
| protected: |
| CrashHandlerHostLinux(); |
| virtual ~CrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| // Only called in concrete subclasses. |
| void InitCrashUploaderThread(); |
| std::string process_type_; |
| -#endif |
| private: |
| void Init(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| // This is here on purpose to make CrashHandlerHostLinux abstract. |
| virtual void SetProcessType() = 0; |
| @@ -81,16 +74,13 @@ |
| // Continue OnFileCanReadWithoutBlocking()'s work on the IO thread. |
| void QueueCrashDumpTask(BreakpadInfo* info, int signal_fd); |
| -#endif |
| int process_socket_; |
| int browser_socket_; |
| -#if defined(USE_LINUX_BREAKPAD) |
| base::MessageLoopForIO::FileDescriptorWatcher file_descriptor_watcher_; |
| scoped_ptr<base::Thread> uploader_thread_; |
| bool shutting_down_; |
| -#endif |
| #if defined(ADDRESS_SANITIZER) |
| char* asan_report_str_; |
| @@ -109,9 +99,7 @@ |
| ExtensionCrashHandlerHostLinux(); |
| virtual ~ExtensionCrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| virtual void SetProcessType() OVERRIDE; |
| -#endif |
| DISALLOW_COPY_AND_ASSIGN(ExtensionCrashHandlerHostLinux); |
| }; |
| @@ -126,9 +114,7 @@ |
| GpuCrashHandlerHostLinux(); |
| virtual ~GpuCrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| virtual void SetProcessType() OVERRIDE; |
| -#endif |
| DISALLOW_COPY_AND_ASSIGN(GpuCrashHandlerHostLinux); |
| }; |
| @@ -143,9 +129,7 @@ |
| PluginCrashHandlerHostLinux(); |
| virtual ~PluginCrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| virtual void SetProcessType() OVERRIDE; |
| -#endif |
| DISALLOW_COPY_AND_ASSIGN(PluginCrashHandlerHostLinux); |
| }; |
| @@ -160,9 +144,7 @@ |
| PpapiCrashHandlerHostLinux(); |
| virtual ~PpapiCrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| virtual void SetProcessType() OVERRIDE; |
| -#endif |
| DISALLOW_COPY_AND_ASSIGN(PpapiCrashHandlerHostLinux); |
| }; |
| @@ -177,9 +159,7 @@ |
| RendererCrashHandlerHostLinux(); |
| virtual ~RendererCrashHandlerHostLinux(); |
| -#if defined(USE_LINUX_BREAKPAD) |
| virtual void SetProcessType() OVERRIDE; |
| -#endif |
| DISALLOW_COPY_AND_ASSIGN(RendererCrashHandlerHostLinux); |
| }; |