| OLD | NEW |
| 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 #import "chrome/app/breakpad_mac.h" | 5 #import "chrome/app/breakpad_mac.h" |
| 6 | 6 |
| 7 #include <CoreFoundation/CoreFoundation.h> | 7 #include <CoreFoundation/CoreFoundation.h> |
| 8 #import <Foundation/Foundation.h> | 8 #import <Foundation/Foundation.h> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // The entire point of this is to block so that the correct | 123 // The entire point of this is to block so that the correct |
| 124 // stack is logged. | 124 // stack is logged. |
| 125 base::ThreadRestrictions::ScopedAllowIO allow_io; | 125 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 126 base::PlatformThread::Join(handle); | 126 base::PlatformThread::Join(handle); |
| 127 } | 127 } |
| 128 } | 128 } |
| 129 | 129 |
| 130 private: | 130 private: |
| 131 DumpHelper() {} | 131 DumpHelper() {} |
| 132 | 132 |
| 133 virtual void ThreadMain() { | 133 virtual void ThreadMain() OVERRIDE { |
| 134 base::PlatformThread::SetName("CrDumpHelper"); | 134 base::PlatformThread::SetName("CrDumpHelper"); |
| 135 BreakpadGenerateAndSendReport(gBreakpadRef); | 135 BreakpadGenerateAndSendReport(gBreakpadRef); |
| 136 } | 136 } |
| 137 | 137 |
| 138 DISALLOW_COPY_AND_ASSIGN(DumpHelper); | 138 DISALLOW_COPY_AND_ASSIGN(DumpHelper); |
| 139 }; | 139 }; |
| 140 | 140 |
| 141 } // namespace | 141 } // namespace |
| 142 | 142 |
| 143 bool IsCrashReporterEnabled() { | 143 bool IsCrashReporterEnabled() { |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 | 292 |
| 293 #if !defined(DISABLE_NACL) | 293 #if !defined(DISABLE_NACL) |
| 294 if (process_type_switch == switches::kNaClLoaderProcess) { | 294 if (process_type_switch == switches::kNaClLoaderProcess) { |
| 295 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); | 295 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); |
| 296 } | 296 } |
| 297 #endif | 297 #endif |
| 298 | 298 |
| 299 // Store process type in crash dump. | 299 // Store process type in crash dump. |
| 300 SetCrashKeyValue(@"ptype", process_type); | 300 SetCrashKeyValue(@"ptype", process_type); |
| 301 } | 301 } |
| OLD | NEW |